v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

B3DImporter: Store meshes in unique_ptr

pull/1635/head
Turo Lamminen 2017-12-12 18:54:41 +02:00
parent acab4c327e
commit f1707e920d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/B3DImporter.cpp
View File

@ -400,8 +400,7 @@ void B3DImporter::ReadTRIS( int v0 ){
Fail( "Bad material id" ); Fail( "Bad material id" );
} }
aiMesh *mesh=new aiMesh; std::unique_ptr<aiMesh> mesh(new aiMesh);
_meshes.push_back( mesh );
mesh->mMaterialIndex=matid; mesh->mMaterialIndex=matid;
mesh->mNumFaces=0; mesh->mNumFaces=0;
@ -429,6 +428,8 @@ void B3DImporter::ReadTRIS( int v0 ){
++mesh->mNumFaces; ++mesh->mNumFaces;
++face; ++face;
} }
_meshes.emplace_back( std::move(mesh) );
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -635,7 +636,7 @@ void B3DImporter::ReadBB3D( aiScene *scene ){
aiNode *node=_nodes[i]; aiNode *node=_nodes[i];
for( size_t j=0;j<node->mNumMeshes;++j ){ for( size_t j=0;j<node->mNumMeshes;++j ){
aiMesh *mesh=_meshes[node->mMeshes[j]]; aiMesh *mesh = _meshes[node->mMeshes[j]].get();
int n_tris=mesh->mNumFaces; int n_tris=mesh->mNumFaces;
int n_verts=mesh->mNumVertices=n_tris * 3; int n_verts=mesh->mNumVertices=n_tris * 3;
@ -708,7 +709,7 @@ void B3DImporter::ReadBB3D( aiScene *scene ){
//meshes //meshes
scene->mNumMeshes= static_cast<unsigned int>(_meshes.size()); scene->mNumMeshes= static_cast<unsigned int>(_meshes.size());
scene->mMeshes=to_array( _meshes ); scene->mMeshes = unique_to_array( _meshes );
//animations //animations
if( _animations.size()==1 && _nodeAnims.size() ){ if( _animations.size()==1 && _nodeAnims.size() ){

2
code/B3DImporter.h
View File

@ -123,7 +123,7 @@ private:
std::vector<Vertex> _vertices; std::vector<Vertex> _vertices;
std::vector<aiNode*> _nodes; std::vector<aiNode*> _nodes;
std::vector<aiMesh*> _meshes; std::vector<std::unique_ptr<aiMesh> > _meshes;
std::vector<aiNodeAnim*> _nodeAnims; std::vector<aiNodeAnim*> _nodeAnims;
std::vector<std::unique_ptr<aiAnimation> > _animations; std::vector<std::unique_ptr<aiAnimation> > _animations;
}; };