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

Timestamp:

07/10/15 14:16:42 (10 years ago)

Author:

epyon

Message:

• mesh_data and key_data are data_channel_set (WIP)
• massive cleanup of privacy in data_channels

File:

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

trunk/src/formats/md5_loader.cc

@@ -10 +10 @@
 #include "nv/stl/vector.hh"
 #include "nv/io/std_stream.hh"
+#include "nv/interface/data_channel_access.hh"
 
 #include <stdio.h>  // sscanf
@@ -136 +137 @@
                 {
                         assert( m_type == MESH );
-                        mesh_data* mesh = new mesh_data("md5_mesh");
+                        data_channel_set_creator mesh;
 
                         uint32 num_verts   = 0;
@@ -163 +164 @@
                                                 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() );
+                                                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() );
+                                                mesh.add_channel( ch_pntiw.release() );
                                         }
                                         weight_info.resize( num_verts );
@@ -210 +211 @@
                                         }              
 
-                                        mesh->add_channel( ch_i.release() );
+                                        mesh.add_channel( ch_i.release() );
                                 }
                                 else if ( command == "numweights" )
@@ -235 +236 @@
                         }
 
-                        prepare_mesh( nodes, weight_info.size(), mesh, weights.data(), weight_info.data() );
-
-                        m_meshes[ num_meshes ] = mesh;
+                        data_channel_set* mdata = mesh.release();
+                        prepare_mesh( nodes, weight_info.size(), mdata, weights.data(), weight_info.data() );
+
+                        m_meshes[ num_meshes ] = mdata;
                         num_meshes++;
                 } // mesh
@@ -258 +260 @@
                                 nodes[i].data      = new key_data;
                                 data_channel_creator< md5_key_t > fc( num_frames );
-                                nodes[i].data->add_channel( fc.release() );
+                                nodes[i].data->add_key_channel( fc.release() );
                                 next_line( sstream ); 
                         }
@@ -335 +337 @@
 }
 
-bool md5_loader::prepare_mesh( mesh_node_data* nodes, uint32 vtx_count, mesh_data* mdata, md5_weight* weights, md5_weight_info* weight_info )
+bool md5_loader::prepare_mesh( mesh_node_data* nodes, uint32 vtx_count, data_channel_set* mdata, md5_weight* weights, md5_weight_info* weight_info )
 {
         assert( m_type == MESH );
@@ -400 +402 @@
         }
 
-        const uint32*    idata = reinterpret_cast< uint32* >( const_cast< uint8* >( mdata->get_index_channel()->raw_data() ) );
+        const uint32*    idata = reinterpret_cast< uint32* >( const_cast< uint8* >( mdata->get_channel( slot::INDEX )->raw_data() ) );
         const md5_vtx_t* tdata = mdata->get_channel_data<md5_vtx_t>();
 
         // Prepare normals
-        uint32 tri_count = mdata->get_count() / 3;
+        uint32 tri_count = mdata->get_channel_size( slot::INDEX ) / 3;
         for ( unsigned int i = 0; i < tri_count; ++i )
         {
@@ -503 +505 @@
 }
 
-mesh_data* nv::md5_loader::release_mesh_data( size_t index )
-{
-        mesh_data* result = m_meshes[ index ];
+data_channel_set* nv::md5_loader::release_mesh_data( size_t index )
+{
+        data_channel_set* result = m_meshes[ index ];
         m_meshes[ index ] = nullptr;
         return result;
@@ -520 +522 @@
 {
         uint32 size = m_meshes.size();
-        mesh_data* meshes = new mesh_data[ size ];
+        data_channel_set* meshes = data_channel_set_creator::create_array( size, 4 );
         for ( uint32 i = 0; i < size; ++i )
         {
-                m_meshes[i]->move_to( meshes[i] );
+                data_channel_set_creator( m_meshes[i] ).move_to( meshes[i] );
                 delete m_meshes[i];
                 m_meshes[i] = nullptr;