Changeset 424 for trunk/src/formats/md3_loader.cc

Timestamp:

07/16/15 21:21:19 (10 years ago)

Author:

epyon

Message:

• refactoring WIP! (compiles though - warnings on purpose)

File:

• trunk/src/formats/md3_loader.cc (modified) (4 diffs)

trunk/src/formats/md3_loader.cc

@@ -324 +324 @@
 data_channel_set* nv::md3_loader::release_mesh_data( nv::size_t index )
 {
-        data_channel_set* data = data_channel_set_creator::create(3);
+        data_channel_set* data = data_channel_set_creator::create_set(3);
         release_mesh_frame( data, -1, static_cast< sint32 >( index ) );
         return data;
@@ -424 +424 @@
                 const md3_tag_t& rtag = md3->tags[i];
                 string_view name( reinterpret_cast< const char* >(rtag.name) );
-
-                nodes[i].transform = mat4();
-                nodes[i].name = hash_string< uint64 >( name.data() );
-                nodes[i].parent_id = -1;
-                nodes[i].data      = data_channel_set_creator::create( 1 );
-                load_tags( data_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
+                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() ) );
+                load_tags( access.add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
         }
         int name_;
@@ -442 +440 @@
         if ( m_merge_all )
         {
-                data = data_channel_set_creator::create_array(1,3);
+                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 ) );
@@ -449 +447 @@
         {
                 count = md3->header.num_surfaces;
-                data = data_channel_set_creator::create_array( count, 3 );
+                data = data_channel_set_creator::create_set_array( count, 3 );
                 for ( int i = 0; i < count; ++i )
                 {