Changeset 425 for trunk/src/formats/md5_loader.cc

Timestamp:

07/17/15 13:34:28 (10 years ago)

Author:

epyon

Message:

• mesh formats now support string loading via string_table
• nmd string_table dump
• fixes all around

File:

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

trunk/src/formats/md5_loader.cc

@@ -112 +112 @@
                         assert( m_nodes == nullptr );
                         nodes = new mesh_node_data[ num_joints ];
-                        int name_; //"md5_bones"
-                        m_nodes = new mesh_nodes_data( 0, num_joints, nodes );
+                        m_nodes = new mesh_nodes_data( make_name( "md5_bones"), num_joints, nodes );
                         discard( sstream, "{" );
                         for ( size_t i = 0; i < m_nodes->get_count(); ++i )
@@ -133 +132 @@
                                 access.set_parent_id( parent_id );
                                 access.set_transform( transform( pos, orient ).inverse().extract() );
-                                access.set_name( hash_string< uint64 >( name.c_str() ) );
+                                access.set_name( make_name( name.c_str() ) );
                                 next_line( sstream );
                         }
@@ -157 +156 @@
                                         sstream >> shader;
                                         remove_quotes( shader );
+                                        maccess.set_name( make_name( shader ) );
                                         next_line( sstream );
                                 }
@@ -243 +243 @@
                         assert( nodes == nullptr );
                         nodes = new mesh_node_data[ num_joints ];
-                        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 );
+                        m_nodes = new mesh_nodes_data( make_name( "md5_animation" ), num_joints, nodes, static_cast< nv::uint16 >( frame_rate ), static_cast< float >( num_frames ), true );
                         joint_infos.resize( num_joints );
 
@@ -257 +256 @@
                                 data_channel_set_creator access( nodes[i].data );
                                 access.add_channel< md5_key_t >( num_frames );
-                                access.set_name( hash_string< uint64 >( name.c_str() ) );
+                                access.set_name( make_name( name.c_str() ) );
                                 access.set_parent_id( parent_id );
                                 next_line( sstream );