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

Timestamp:

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

Author:

epyon

Message:

• further access restrictions improvements

File:

• trunk/src/formats/md2_loader.cc (modified) (3 diffs)

trunk/src/formats/md2_loader.cc

@@ -326 +326 @@
         size_t frame_count   = ( frame == -1 ? num_frames : 1 );
 
-        data_channel_creator< vtx_md2_pn > mc_pn( num_verts * frame_count );
-        vtx_md2_pn* vtx_pn = mc_pn.data();
+        data_channel_set_creator maccess( data );
+        vtx_md2_pn* vtx_pn = maccess.add_channel< vtx_md2_pn >( num_verts * frame_count ).data();
+        vtx_md2_t* vtx_t   = maccess.add_channel< vtx_md2_t >( num_verts ).data();
+        uint16* icp        = &maccess.add_channel< index_u16 >( m_new_indexes.size() ).data()->index;
 
         uint32 index = 0;
@@ -349 +351 @@
         }
 
-        data_channel_creator< vtx_md2_t > mc_t( num_verts );
-        vtx_md2_t* vtx_t = mc_t.data();
-
         vec2 scale( 1.0f / static_cast<float>( md2->header.skinwidth ), 1.0f / static_cast<float>( md2->header.skinheight ) );
         for (size_t i = 0; i < num_verts; ++i )
@@ -359 +358 @@
         }
 
-        data_channel_creator< index_u16 > ic( m_new_indexes.size() );
         if ( m_new_indexes.size() > 0 )
         {
-                uint16* icp = reinterpret_cast< uint16* >( ic.raw_data() );
                 raw_copy_n( m_new_indexes.data(), m_new_indexes.size(), icp );
         }
 
-        data_channel_set_creator maccess( data );
-
-        maccess.add_channel( mc_pn.release() );
-        maccess.add_channel( mc_t.release() );
-        maccess.add_channel( ic.release() );
 }