Changeset 425 for trunk/src/formats/md3_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/md3_loader.cc (modified) (5 diffs)

trunk/src/formats/md3_loader.cc

@@ -235 +235 @@
 static bool s_normal_ready = false;
 
-md3_loader::md3_loader( bool merge_all )
-        : m_merge_all( merge_all ), m_md3( nullptr )
+md3_loader::md3_loader( string_table* strings, bool merge_all )
+        : mesh_loader( strings ), m_merge_all( merge_all ), m_md3( nullptr )
 {
         if ( !s_normal_ready )
@@ -353 +353 @@
 
         data_channel_set_creator maccess( data );
-        maccess.set_name( reinterpret_cast<char*>( md3->header.name ) );
+        maccess.set_name( make_name( reinterpret_cast<char*>( md3->header.name ) ) );
+
 
         vtx_md3_pn* vtx_pn = maccess.add_channel< vtx_md3_pn >( static_cast< uint32 >( num_verts * frame_count ) ).data();
@@ -426 +427 @@
                 nodes[i].data      = data_channel_set_creator::create_set( 1 );
                 data_channel_set_creator access( nodes[i].data );
-                access.set_name( hash_string< uint64 >( name.data() ) );
+                access.set_name( make_name( name ) );
                 load_tags( access.add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
         }
-        int name_;
-        return new mesh_nodes_data( 0,/*"tags"*/ node_count, nodes );
+        return new mesh_nodes_data( m_strings ? m_strings->insert( "tags" ) : 0, node_count, nodes );
 }
 
@@ -442 +442 @@
                 data = data_channel_set_creator::create_set_array(1,3);
                 release_mesh_frame( &data[0], -1, -1 );
-                data_channel_set_creator( &data[0] ).set_name( reinterpret_cast< char* >( md3->header.name ) );
         }
         else
@@ -451 +450 @@
                 {
                         release_mesh_frame( &data[i], -1, i );
-                        data_channel_set_creator( &data[i] ).set_name( reinterpret_cast< char* >( md3->surfaces[i].header.name ) );
+                        data_channel_set_creator( &data[i] ).set_name( make_name( reinterpret_cast< char* >( md3->surfaces[i].header.name ) ) );
                 }
         }