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

Timestamp:

07/10/15 19:50:47 (10 years ago)

Author:

epyon

Message:

• further access restrictions improvements

File:

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

trunk/src/formats/md3_loader.cc

@@ -287 +287 @@
 }
 
-nv::raw_data_channel* nv::md3_loader::load_tags( const string_view& tag )
+void nv::md3_loader::load_tags( raw_data_channel* channel, const string_view& tag )
 {
         md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 );
-        data_channel_creator< md3_key > result( uint32( md3->header.num_frames ) );
+        data_channel_access< md3_key > access( channel );
         // TODO: is this brain damaged in efficiency (loop nest order) or what?
         for ( sint32 f = 0; f < md3->header.num_frames; ++f )
@@ -304 +304 @@
                                 vec3 axisy  ( md3_vec3( rtag.axis[2] ) );
                                 vec3 origin ( md3_vec3( rtag.origin )  );
-                                result.data()[f].tform = transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
+                                access.data()[f].tform = transform( origin, quat( mat3( axisx, axisy, axisz ) ) );
                         }
                 }
 
         }
-        return result.release();
 }
 
@@ -353 +352 @@
                 }
 
-        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);
+        data_channel_set_creator maccess( data );
+        maccess.set_name( reinterpret_cast<char*>( md3->header.name ) );
+
+        vtx_md3_pn* vtx_pn = maccess.add_channel< vtx_md3_pn >( static_cast< uint32 >( num_verts * frame_count ) ).data();
+        vtx_md3_t*  vtx_t  = maccess.add_channel< vtx_md3_t >( static_cast< uint32 >( num_verts ) ).data();
+        uint16*     icp    = reinterpret_cast< uint16* >( maccess.add_channel< index_u16 >( static_cast< uint32 >( index_count ) ).data() );
 
         uint32 index  = 0;
@@ -413 +412 @@
         }
 
-        data_channel_set_creator maccess( data );
-        maccess.set_name( reinterpret_cast<char*>( md3->header.name ) );
-        maccess.add_channel( mc_pn.release() );
-        maccess.add_channel( mc_t.release() );
-        maccess.add_channel( ic.release() );
 }
 
@@ -435 +429 @@
                 nodes[i].parent_id = -1;
                 nodes[i].target_id = -1;
-                nodes[i].data      = new key_data;
-        
-                raw_data_channel* keys = load_tags( name );
-                nodes[i].data->add_key_channel( keys );
+                nodes[i].data      = key_channel_set_creator::create( 1 );
+                load_tags( key_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
         }
         return new mesh_nodes_data( "tags", node_count, nodes );