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

Timestamp:

07/09/15 12:19:30 (10 years ago)

Author:

epyon

Message:

• mesh_raw_channel and key_raw_channel merged into raw_data_channel

File:

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

trunk/src/formats/md3_loader.cc

@@ -286 +286 @@
 }
 
-nv::key_raw_channel* nv::md3_loader::load_tags( const string_view& tag )
+nv::raw_data_channel* nv::md3_loader::load_tags( const string_view& tag )
 {
         md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 );
-        key_raw_channel* result = key_raw_channel::create<md3_key>( uint32( md3->header.num_frames ) );
+        raw_data_channel* result = raw_data_channel::create<md3_key>( uint32( md3->header.num_frames ) );
         // TODO: is this brain damaged in efficiency (loop nest order) or what?
         for ( sint32 f = 0; f < md3->header.num_frames; ++f )
@@ -352 +352 @@
                 }
 
-        mesh_raw_channel* mc_pn = mesh_raw_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) );
-        mesh_raw_channel* mc_t  = mesh_raw_channel::create< vtx_md3_t >( uint32( num_verts ) );
-        mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( uint32( index_count ) );
+        raw_data_channel* mc_pn = raw_data_channel::create< vtx_md3_pn >( uint32( num_verts * frame_count ) );
+        raw_data_channel* mc_t  = raw_data_channel::create< vtx_md3_t >( uint32( num_verts ) );
+        raw_data_channel* ic = raw_data_channel::create_index< uint16 >( uint32( index_count ) );
         vtx_md3_pn* vtx_pn = reinterpret_cast< vtx_md3_pn* >( mc_pn->data );
         vtx_md3_t*  vtx_t  = reinterpret_cast< vtx_md3_t* >( mc_t->data );
@@ -435 +435 @@
                 nodes[i].data      = new key_data;
         
-                key_raw_channel* keys = load_tags( name );
+                raw_data_channel* keys = load_tags( name );
                 nodes[i].data->add_channel( keys );
         }