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

Timestamp:

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

Author:

epyon

Message:

• further access restrictions improvements

File:

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

trunk/src/formats/md5_loader.cc

@@ -137 +137 @@
                 {
                         assert( m_type == MESH );
-                        data_channel_set_creator mesh;
+                        data_channel_set* mesh = data_channel_set_creator::create( 4 );
+                        data_channel_set_creator maccess( mesh );
 
                         uint32 num_verts   = 0;
@@ -160 +161 @@
                                         md5_vtx_t* tdata = nullptr;
                                         {
-                                                data_channel_creator<md5_vtx_pnt>   ch_pnt( num_verts );
-                                                data_channel_creator<md5_vtx_t>     ch_t( num_verts );
-                                                data_channel_creator<md5_vtx_pntiw> ch_pntiw( num_verts );
-                                                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;
-                                                mesh.add_channel( ch_pntiw.release() );
+                                                maccess.add_channel<md5_vtx_pnt>( num_verts );
+                                                tdata = maccess.add_channel<md5_vtx_t>( num_verts ).data();
+                                                maccess.add_channel<md5_vtx_pntiw>( num_verts );
                                         }
                                         weight_info.resize( num_verts );
@@ -191 +186 @@
                                         sstream >> num_tris;
 
-                                        data_channel_creator< index_u32 > ch_i( num_tris * 3 );
-                                        uint32* vtx_i                = reinterpret_cast< uint32* >( ch_i.raw_data() );
+                                        uint32* vtx_i = reinterpret_cast< uint32* >( maccess.add_channel< index_u32 >( num_tris * 3 ).raw_data() );
                                         uint32 idx = 0;
 
@@ -211 +205 @@
                                         }              
 
-                                        mesh.add_channel( ch_i.release() );
                                 }
                                 else if ( command == "numweights" )
@@ -236 +229 @@
                         }
 
-                        data_channel_set* mdata = mesh.release();
-                        prepare_mesh( nodes, weight_info.size(), mdata, weights.data(), weight_info.data() );
-
-                        m_meshes[ num_meshes ] = mdata;
+                        prepare_mesh( nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
+
+                        m_meshes[ num_meshes ] = mesh;
                         num_meshes++;
                 } // mesh
@@ -258 +250 @@
                                 nodes[i].transform = mat4();
                                 nodes[i].target_id = -1;
-                                nodes[i].data      = new key_data;
-                                data_channel_creator< md5_key_t > fc( num_frames );
-                                nodes[i].data->add_key_channel( fc.release() );
-                                next_line( sstream ); 
+                                nodes[i].data = key_channel_set_creator::create( 1 );
+                                key_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
+                                next_line( sstream );
                         }
                         discard( sstream, "}" );
@@ -340 +331 @@
 {
         assert( m_type == MESH );
-        data_channel_creator< md5_vtx_pnt >   pnt  ( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) );
-        data_channel_creator< md5_vtx_pntiw > pntiw( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pntiw >() ) );
+        data_channel_access< md5_vtx_pnt >   pnt  ( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pnt >() ) );
+        data_channel_access< md5_vtx_pntiw > pntiw( const_cast< raw_data_channel* >( mdata->get_channel< md5_vtx_pntiw >() ) );
         md5_vtx_pntiw* vtx_data = pntiw.data();
         md5_vtx_pnt* vtcs = pnt.data();