Skip to content

Commit 104dc1e

Browse files
committed
do not store mesh in model asset
1 parent 18c036d commit 104dc1e

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

sources/include/cage-engine/model.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ namespace cage
3434
void dispatch() const;
3535
void dispatch(uint32 instances) const;
3636

37-
Holder<const Mesh> mesh;
3837
Holder<const Collider> collider;
39-
4038
Mat4 importTransform;
4139
Aabb boundingBox = Aabb::Universe();
4240
uint32 textureNames[MaxTexturesCountPerMaterial] = {};

sources/libengine/assets/model.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ namespace cage
2626
Holder<Mesh> mesh = newMesh();
2727
mesh->importBuffer(des.read(data.meshSize));
2828
model->importMesh(+mesh, mat);
29-
model->mesh = std::move(mesh);
3029

3130
if (data.colliderSize)
3231
{

sources/libengine/graphics/model.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ namespace cage
225225
void Model::setBuffers(uint32 vertexSize, PointerRange<const char> vertexData, PointerRange<const uint32> indexData, PointerRange<const char> materialBuffer)
226226
{
227227
ModelImpl *impl = (ModelImpl *)this;
228-
impl->mesh.clear();
229228
{
230229
if (impl->vbo)
231230
{

sources/libengine/graphics/renderPipeline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,8 @@ namespace cage
611611
if (renderMode != RenderModeEnum::Color)
612612
return;
613613

614-
const Holder<Model> mesh = std::get<RenderIcon>(rd.data).mesh.share();
615-
const Holder<Texture> texture = std::get<RenderIcon>(rd.data).texture.share();
614+
const Holder<Model> &mesh = std::get<RenderIcon>(rd.data).mesh;
615+
const Holder<Texture> &texture = std::get<RenderIcon>(rd.data).texture;
616616

617617
Holder<ShaderProgram> shader = [&]()
618618
{

0 commit comments

Comments
 (0)