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

Timestamp:

07/09/15 20:02:58 (10 years ago)

Author:

epyon

Message:

• naming scheme for data_descriptor changed
• channels can only be created by data_channel_creators

File:

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

trunk/src/formats/md5_loader.cc

@@ -137 +137 @@
                         assert( m_type == MESH );
                         mesh_data* mesh = new mesh_data("md5_mesh");
-                        raw_data_channel* ch_pntiw = nullptr;
 
                         uint32 num_verts   = 0;
@@ -160 +159 @@
                                         md5_vtx_t* tdata = nullptr;
                                         {
-                                                data_channel_creator<md5_vtx_pnt> ch_pnt( num_verts );
-                                                data_channel_creator<md5_vtx_t>   ch_t( num_verts );
-                                                ch_pntiw = raw_data_channel::create<md5_vtx_pntiw>( num_verts );
+                                                data_channel_creator<md5_vtx_pnt>   ch_pnt( num_verts );
+                                                data_channel_creator<md5_vtx_t>     ch_t( num_verts );
+                                                data_channel_creator<md5_vtx_pntiw> ch_pntiw( num_verts );
                                                 tdata = ch_t.data();
                                                 mesh->add_channel( ch_pnt.release() );
@@ -168 +167 @@
                                                 // TODO: hack to prevent rendering
                                                 //ch_pntiw->m_count = 0;
-                                                mesh->add_channel( ch_pntiw );
+                                                mesh->add_channel( ch_pntiw.release() );
                                         }
                                         weight_info.resize( num_verts );
@@ -236 +235 @@
                         }
 
-                        prepare_mesh( reinterpret_cast< md5_vtx_pntiw* >( const_cast< uint8* >( ch_pntiw->raw_data() ) ), nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
+                        prepare_mesh( nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
 
                         m_meshes[ num_meshes ] = mesh;
@@ -258 +257 @@
                                 nodes[i].target_id = -1;
                                 nodes[i].data      = new key_data;
-                                nodes[i].data->add_channel( raw_data_channel::create< md5_key_t >( num_frames ) );
+                                data_channel_creator< md5_key_t > fc( num_frames );
+                                nodes[i].data->add_channel( fc.release() );
                                 next_line( sstream ); 
                         }
@@ -335 +335 @@
 }
 
-bool md5_loader::prepare_mesh( md5_vtx_pntiw* vtx_data, mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info )
+bool md5_loader::prepare_mesh( mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info )
 {
         assert( m_type == MESH );
-        data_channel_creator< md5_vtx_pnt > pnt( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) );
-        md5_vtx_pnt* vtcs       = pnt.data(); 
+        data_channel_creator< md5_vtx_pnt >   pnt  ( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) );
+        data_channel_creator< md5_vtx_pntiw > pntiw( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pntiw >() ) );
+        md5_vtx_pntiw* vtx_data = pntiw.data();
+        md5_vtx_pnt* vtcs = pnt.data();
 
         for ( uint32 i = 0; i < vtx_count; ++i )
@@ -488 +490 @@
                         const transform* ptv = reinterpret_cast< const transform* >( pjoint.data->get_channel(0)->raw_data() );
                         transform ptr;
-                        if ( pjoint.data->get_channel(0)->element_count() > index ) ptr = ptv[ index ];
+                        if ( pjoint.data->get_channel(0)->size() > index ) ptr = ptv[ index ];
                         vec3 rot_pos = ptr.get_orientation() * pos;