Changeset 294 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/28/14 03:05:19 (11 years ago)

Author:

epyon

Message:

• mesh_creator -- very robust tangent generation mechanism
• keyframed_mesh - support for meshes with tangent data
• minor cleanups

File:

• trunk/src/formats/assimp_loader.cc (modified) (3 diffs)

trunk/src/formats/assimp_loader.cc

@@ -339 +339 @@
 }
 
-mesh_nodes_data* nv::assimp_loader::release_animation( size_t index )
+mesh_nodes_data* nv::assimp_loader::release_mesh_nodes_data( size_t index /*= 0*/ )
 {
         if ( m_scene == nullptr ) return nullptr;
@@ -476 +476 @@
         }
 
-        mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_animation(0) );
+        mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_mesh_nodes_data(0) );
         return new mesh_data_pack( m_mesh_count, meshes, nodes );
 }
@@ -487 +487 @@
 }
 
-mesh_nodes_data* nv::assimp_loader::release_mesh_nodes_data( size_t index /*= 0 */ )
-{
-        return release_animation( index );
-}
-
+