Changeset 423 for trunk/src/formats/md5_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/md5_loader.cc (modified) (4 diffs)

trunk/src/formats/md5_loader.cc

@@ -112 +112 @@
                         assert( m_nodes == nullptr );
                         nodes = new mesh_node_data[ num_joints ];
-                        m_nodes = new mesh_nodes_data( "md5_bones", num_joints, nodes );
+                        int name_; //"md5_bones"
+                        m_nodes = new mesh_nodes_data( 0, num_joints, nodes );
                         discard( sstream, "{" );
                         for ( size_t i = 0; i < m_nodes->get_count(); ++i )
@@ -128 +129 @@
                                 remove_quotes( name );
 //                              nodes[i].name = name;
-                                nodes[i].name_hash = hash_string< uint64 >( name.c_str() );
+                                nodes[i].name = hash_string< uint64 >( name.c_str() );
 //                              nodes[i].target_id       = -1;
                                 nodes[i].parent_id       = -1;
@@ -242 +243 @@
                         assert( nodes == nullptr );
                         nodes = new mesh_node_data[ num_joints ];
-                        m_nodes = new mesh_nodes_data( "md5_animation", num_joints, nodes, static_cast< nv::uint16 >( frame_rate ), static_cast< float >( num_frames ), true );
+                        int name_;
+                        m_nodes = new mesh_nodes_data( 0/*"md5_animation"*/, num_joints, nodes, static_cast< nv::uint16 >( frame_rate ), static_cast< float >( num_frames ), true );
                         joint_infos.resize( num_joints );
 
@@ -252 +254 @@
                                 remove_quotes( name );
 //                              nodes[i].name = name;
-                                nodes[i].name_hash = hash_string< uint64 >( name.c_str() );
+                                nodes[i].name = hash_string< uint64 >( name.c_str() );
                                 nodes[i].transform = mat4();
                                 nodes[i].data = data_channel_set_creator::create( 1 );