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

Timestamp:

07/16/15 19:24:30 (10 years ago)

Author:

epyon

Message:

• removal of several strings, string hashes used
• WIP some data lost - see explicit warnings
• name_hash to name
• more nmd updates
• animation names as hashes

File:

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

trunk/src/formats/assimp_loader.cc

@@ -200 +200 @@
                 mat4    offset = assimp_mat4_cast( bone->mOffsetMatrix );
 //              bones[m].name = bone->mName.data;
-                bones[m].name_hash = hash_string< uint64 >( bone->mName.data );
+                bones[m].name = hash_string< uint64 >( bone->mName.data );
                 bones[m].data = nullptr;
                 bones[m].parent_id = -1;
@@ -302 +302 @@
 
                                 mesh_node_data& bone = bones[b];
-                                auto iname = names.find( bone.name_hash );
+                                auto iname = names.find( bone.name );
                                 if ( iname == names.end() )
                                 {
@@ -308 +308 @@
                                         uint16 index = uint16( final_bones.size() );
                                         final_bones.push_back( bone );
-                                        names[ bone.name_hash] = index;
+                                        names[ bone.name] = index;
                                         translate[b] = index;
                                 }
@@ -336 +336 @@
         mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
         raw_copy( final_bones.begin(), final_bones.end(), bones );
-        return new mesh_nodes_data( "bones", final_bones.size(), bones );
+        int name_;
+        return new mesh_nodes_data( /*"bones"*/0, final_bones.size(), bones );
 }
 
@@ -357 +358 @@
         load_node( index, data, root, 0, -1 );
 
-        return new mesh_nodes_data( anim->mName.data, count, data, frame_rate, duration, flat );
+        int name;
+        return new mesh_nodes_data( /*anim->mName.data*/0, count, data, frame_rate, duration, flat );
 }
 
@@ -389 +391 @@
 
 //      a_data.name      = name;
-        a_data.name_hash = hash_string< uint64 >( name.c_str() );
+        a_data.name = 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!