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

Timestamp:

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

Author:

epyon

Message:

• data_descriptor creators ( buggy )

File:

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

trunk/src/formats/md3_loader.cc

@@ -289 +289 @@
 {
         md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 );
-        raw_data_channel* result = raw_data_channel::create<md3_key>( uint32( md3->header.num_frames ) );
+        data_channel_creator< md3_key > result( 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 )
@@ -303 +303 @@
                                 vec3 axisy  ( md3_vec3( rtag.axis[2] ) );
                                 vec3 origin ( md3_vec3( rtag.origin )  );
-                                reinterpret_cast< md3_key*>(result->data)[f].tform = transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
+                                result.data()[f].tform = transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
                         }
                 }
 
         }
-        return result;
+        return result.release();
 }
 
@@ -352 +352 @@
                 }
 
-        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_u16 >( 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 );
-        uint16*     icp    = reinterpret_cast< uint16* >( ic->data );
+        data_channel_creator< vtx_md3_pn > mc_pn( static_cast< uint32 >( num_verts * frame_count ) );
+        data_channel_creator< vtx_md3_t > mc_t( static_cast< uint32 >( num_verts ) );
+        data_channel_creator< index_u16 > ic( static_cast< uint32 >( index_count ) );
+        vtx_md3_pn* vtx_pn = mc_pn.data();
+        vtx_md3_t*  vtx_t = mc_t.data();
+        uint16*     icp    = &(ic.data()[0].index);
 
         uint32 index  = 0;
@@ -413 +413 @@
 
         data->set_name( reinterpret_cast< char* >( md3->header.name ) );
-        data->add_channel( mc_pn );
-        data->add_channel( mc_t );
-        data->add_channel( ic );
+        data->add_channel( mc_pn.release() );
+        data->add_channel( mc_t.release() );
+        data->add_channel( ic.release() );
 }