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

Timestamp:

07/15/15 19:59:40 (10 years ago)

Author:

epyon

Message:

• mesh nodes store name hash instead of string
• nmd format refactoring

File:

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

trunk/src/formats/assimp_loader.cc

@@ -199 +199 @@
                 aiBone* bone   = mesh->mBones[m];
                 mat4    offset = assimp_mat4_cast( bone->mOffsetMatrix );
-                bones[m].name = bone->mName.data;
+//              bones[m].name = bone->mName.data;
+                bones[m].name_hash = hash_string< uint64 >( bone->mName.data );
                 bones[m].data = nullptr;
                 bones[m].parent_id = -1;
-                bones[m].target_id = -1;
+//              bones[m].target_id = -1;
                 bones[m].transform = offset;
         }
@@ -287 +288 @@
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         vector< mesh_node_data > final_bones;
-        unordered_map< std::string, uint16 > names;
+        unordered_map< uint64, uint16 > names;
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {
@@ -301 +302 @@
 
                                 mesh_node_data& bone = bones[b];
-                                auto iname = names.find( bone.name );
+                                auto iname = names.find( bone.name_hash );
                                 if ( iname == names.end() )
                                 {
@@ -307 +308 @@
                                         uint16 index = uint16( final_bones.size() );
                                         final_bones.push_back( bone );
-                                        names[ bone.name ] = index;
+                                        names[ bone.name_hash] = index;
                                         translate[b] = index;
                                 }
@@ -387 +388 @@
         mesh_node_data& a_data = nodes[ this_id ];
 
-        a_data.name      = name;
-        a_data.target_id = -1;
+//      a_data.name      = name;
+        a_data.name_hash = hash_string< uint64 >( name.c_str() );
         a_data.parent_id = parent_id;
         // This value is ignored by the create_transformed_keys, but needed by create_direct_keys!