Changeset 480 for trunk/src/formats/assimp_loader.cc
- Timestamp:
- 11/03/15 19:06:23 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/formats/assimp_loader.cc
r475 r480 462 462 } 463 463 464 mesh_data_pack* nv::assimp_loader::release_mesh_data_pack()465 {466 if ( m_scene == nullptr || m_mesh_count == 0 ) return nullptr;467 const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );468 bool has_bones = false;469 data_channel_set* meshes = data_channel_set_creator::create_set_array( m_mesh_count, 2 );470 for ( size_t m = 0; m < m_mesh_count; ++m )471 {472 const aiMesh* mesh = scene->mMeshes[ m ];473 data_channel_set_creator( &meshes[m] ).set_name( make_name( static_cast<const char*>( mesh->mName.data ) ) );474 if ( mesh->mNumBones > 0 ) has_bones = true;475 load_mesh_data(&meshes[m],m);476 }477 478 mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_mesh_nodes_data(0) );479 return new mesh_data_pack( m_mesh_count, meshes, nodes );480 }464 // mesh_data_pack* nv::assimp_loader::release_mesh_data_pack() 465 // { 466 // if ( m_scene == nullptr || m_mesh_count == 0 ) return nullptr; 467 // const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene ); 468 // bool has_bones = false; 469 // data_channel_set* meshes = data_channel_set_creator::create_set_array( m_mesh_count, 2 ); 470 // for ( size_t m = 0; m < m_mesh_count; ++m ) 471 // { 472 // const aiMesh* mesh = scene->mMeshes[ m ]; 473 // data_channel_set_creator( &meshes[m] ).set_name( make_name( static_cast<const char*>( mesh->mName.data ) ) ); 474 // if ( mesh->mNumBones > 0 ) has_bones = true; 475 // load_mesh_data(&meshes[m],m); 476 // } 477 // 478 // mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_mesh_nodes_data(0) ); 479 // return new mesh_data_pack( m_mesh_count, meshes, nodes ); 480 // } 481 481 482 482 nv::size_t nv::assimp_loader::get_nodes_data_count() const
Note: See TracChangeset
for help on using the changeset viewer.