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

trunk/src/formats/md5_loader.cc

@@ -159 +159 @@
                                         md5_vtx_t* tdata = nullptr;
                                         {
-                                                mesh_raw_channel* ch_pnt = mesh_raw_channel::create<md5_vtx_pnt>( num_verts );
-                                                mesh_raw_channel* ch_t   = mesh_raw_channel::create<md5_vtx_t>( num_verts );
-                                                mesh_raw_channel* ch_pntiw = mesh_raw_channel::create<md5_vtx_pntiw>( num_verts );
+                                                raw_data_channel* ch_pnt = raw_data_channel::create<md5_vtx_pnt>( num_verts );
+                                                raw_data_channel* ch_t   = raw_data_channel::create<md5_vtx_t>( num_verts );
+                                                raw_data_channel* ch_pntiw = raw_data_channel::create<md5_vtx_pntiw>( num_verts );
                                                 tdata = reinterpret_cast< md5_vtx_t* >( ch_t->data );
                                                 mesh->add_channel( ch_pnt );
@@ -190 +190 @@
                                         sstream >> num_tris;
 
-                                        mesh_raw_channel* ch_i = mesh_raw_channel::create_index<uint32>( num_tris * 3 );
+                                        raw_data_channel* ch_i = raw_data_channel::create_index<uint32>( num_tris * 3 );
                                         uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i->data );
                                         uint32 idx = 0;
@@ -256 +256 @@
                                 nodes[i].target_id = -1;
                                 nodes[i].data      = new key_data;
-                                nodes[i].data->add_channel( key_raw_channel::create< md5_key_t >( num_frames ) );
+                                nodes[i].data->add_channel( raw_data_channel::create< md5_key_t >( num_frames ) );
                                 next_line( sstream ); 
                         }