Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-07-04 15:05:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not stack-allocate SSkinMeshBuffer

Browse Source
This commit is contained in:
Lars Mueller 2024-05-22 15:56:21 +02:00
parent b419d0e445
commit be375cdfb6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irr/include/ISkinnedMesh.h
View File

@ -200,7 +200,7 @@ class ISkinnedMesh : public IAnimatedMesh
virtual SSkinMeshBuffer *addMeshBuffer() = 0; virtual SSkinMeshBuffer *addMeshBuffer() = 0;
//! Adds a new meshbuffer to the mesh, access it as last one //! Adds a new meshbuffer to the mesh, access it as last one
virtual void addMeshBuffer(SSkinMeshBuffer &&meshbuf) = 0; virtual void addMeshBuffer(SSkinMeshBuffer *meshbuf) = 0;
//! Adds a new joint to the mesh, access it as last one //! Adds a new joint to the mesh, access it as last one
virtual SJoint *addJoint(SJoint *parent = 0) = 0; virtual SJoint *addJoint(SJoint *parent = 0) = 0;

2
irr/src/CGLTFMeshFileLoader.cpp
View File

@ -428,7 +428,7 @@ void SelfType::MeshExtractor::loadMesh(
} }
m_irr_model->addMeshBuffer( m_irr_model->addMeshBuffer(
SSkinMeshBuffer(std::move(*vertices), std::move(indices))); new SSkinMeshBuffer(std::move(*vertices), std::move(indices)));
} }
} }

4
irr/src/CSkinnedMesh.cpp
View File

@ -1062,9 +1062,9 @@ scene::SSkinMeshBuffer *CSkinnedMesh::addMeshBuffer()
return buffer; return buffer;
} }
void CSkinnedMesh::addMeshBuffer(SSkinMeshBuffer &&meshbuf) void CSkinnedMesh::addMeshBuffer(SSkinMeshBuffer *meshbuf)
{ {
LocalBuffers.push_back(new SSkinMeshBuffer(std::move(meshbuf))); LocalBuffers.push_back(meshbuf);
} }
CSkinnedMesh::SJoint *CSkinnedMesh::addJoint(SJoint *parent) CSkinnedMesh::SJoint *CSkinnedMesh::addJoint(SJoint *parent)

2
irr/src/CSkinnedMesh.h
View File

@ -130,7 +130,7 @@ class CSkinnedMesh : public ISkinnedMesh
SSkinMeshBuffer *addMeshBuffer() override; SSkinMeshBuffer *addMeshBuffer() override;
//! Adds a new meshbuffer to the mesh, access it as last one //! Adds a new meshbuffer to the mesh, access it as last one
void addMeshBuffer(SSkinMeshBuffer &&meshbuf) override; void addMeshBuffer(SSkinMeshBuffer *meshbuf) override;
//! Adds a new joint to the mesh, access it as last one //! Adds a new joint to the mesh, access it as last one
SJoint *addJoint(SJoint *parent = 0) override; SJoint *addJoint(SJoint *parent = 0) override;