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

Timestamp:

07/09/15 14:40:36 (10 years ago)

Author:

epyon

Message:

• refactoring of raw_data_channel and data_descriptor access

File:

• trunk/src/formats/md5_loader.cc (modified) (6 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;
@@ -161 +162 @@
                                                 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 );
+                                                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 );
                                                 mesh->add_channel( ch_t );
                                                 // TODO: hack to prevent rendering
-                                                ch_pntiw->count = 0;
+                                                //ch_pntiw->m_count = 0;
                                                 mesh->add_channel( ch_pntiw );
                                         }
@@ -190 +191 @@
                                         sstream >> num_tris;
 
-                                        raw_data_channel* ch_i = raw_data_channel::create_index<uint32>( num_tris * 3 );
+                                        raw_data_channel* ch_i = raw_data_channel::create<index_u32>( num_tris * 3 );
                                         uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i->data );
                                         uint32 idx = 0;
@@ -234 +235 @@
                         }
 
-                        prepare_mesh( nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
+                        prepare_mesh( reinterpret_cast< md5_vtx_pntiw* >( ch_pntiw->data ), nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
 
                         m_meshes[ num_meshes ] = mesh;
@@ -333 +334 @@
 }
 
-bool md5_loader::prepare_mesh( mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info )
+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 )
 {
         assert( m_type == MESH );
         md5_vtx_pnt* vtcs       = reinterpret_cast< md5_vtx_pnt* >( mdata->get_channel< md5_vtx_pnt >()->data ); 
-        md5_vtx_pntiw* vtx_data = reinterpret_cast< md5_vtx_pntiw* >( mdata->get_channel< md5_vtx_pntiw >()->data );
 
         for ( uint32 i = 0; i < vtx_count; ++i )
@@ -486 +486 @@
                         const transform* ptv = reinterpret_cast< const transform* >( pjoint.data->get_channel(0)->data );
                         transform ptr;
-                        if ( pjoint.data->get_channel(0)->count > index ) ptr = ptv[ index ];
+                        if ( pjoint.data->get_channel(0)->element_count() > index ) ptr = ptv[ index ];
                         vec3 rot_pos = ptr.get_orientation() * pos;