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

Timestamp:

07/09/15 18:53:08 (10 years ago)

Author:

epyon

Message:

• data_descriptor creators ( buggy )

File:

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

trunk/src/formats/md5_loader.cc

@@ -160 +160 @@
                                         md5_vtx_t* tdata = nullptr;
                                         {
-                                                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 );
+                                                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 );
-                                                tdata = reinterpret_cast< md5_vtx_t* >( ch_t->data );
-                                                mesh->add_channel( ch_pnt );
-                                                mesh->add_channel( ch_t );
+                                                tdata = ch_t.data();
+                                                mesh->add_channel( ch_pnt.release() );
+                                                mesh->add_channel( ch_t.release() );
                                                 // TODO: hack to prevent rendering
                                                 //ch_pntiw->m_count = 0;
@@ -191 +191 @@
                                         sstream >> num_tris;
 
-                                        raw_data_channel* ch_i = raw_data_channel::create<index_u32>( num_tris * 3 );
-                                        uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i->data );
+                                        data_channel_creator< index_u32 > ch_i( num_tris * 3 );
+                                        uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i.raw_data() );
                                         uint32 idx = 0;
-                                        mesh->add_channel( ch_i );
 
                                         next_line( sstream );
@@ -211 +210 @@
                                                 vtx_i[idx++] = ti2;
                                         }              
+
+                                        mesh->add_channel( ch_i.release() );
                                 }
                                 else if ( command == "numweights" )
@@ -235 +236 @@
                         }
 
-                        prepare_mesh( reinterpret_cast< md5_vtx_pntiw* >( ch_pntiw->data ), nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
+                        prepare_mesh( reinterpret_cast< md5_vtx_pntiw* >( const_cast< uint8* >( ch_pntiw->raw_data() ) ), nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
 
                         m_meshes[ num_meshes ] = mesh;
@@ -337 +338 @@
 {
         assert( m_type == MESH );
-        md5_vtx_pnt* vtcs       = reinterpret_cast< md5_vtx_pnt* >( mdata->get_channel< md5_vtx_pnt >()->data ); 
+        data_channel_creator< md5_vtx_pnt > pnt( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) );
+        md5_vtx_pnt* vtcs       = pnt.data(); 
 
         for ( uint32 i = 0; i < vtx_count; ++i )
@@ -396 +398 @@
         }
 
-        const uint32*    idata = reinterpret_cast< uint32* >( mdata->get_index_channel()->data );
+        const uint32*    idata = reinterpret_cast< uint32* >( const_cast< uint8* >( mdata->get_index_channel()->raw_data() ) );
         const md5_vtx_t* tdata = mdata->get_channel_data<md5_vtx_t>();
 
@@ -484 +486 @@
                 {
                         const mesh_node_data& pjoint = nodes[parent_id];
-                        const transform* ptv = reinterpret_cast< const transform* >( pjoint.data->get_channel(0)->data );
+                        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 ];
@@ -495 +497 @@
                 }
 
-                reinterpret_cast< transform* >( joint.data->get_channel(0)->data )[index] = transform( pos, orient );
+                reinterpret_cast< transform* >( const_cast< uint8* >( joint.data->get_channel(0)->raw_data() ) )[index] = transform( pos, orient );
         }
 }