Changeset 416 for trunk/src/formats/md3_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/md3_loader.cc (modified) (5 diffs)

trunk/src/formats/md3_loader.cc

@@ -8 +8 @@
 
 #include "nv/core/logging.hh"
+#include "nv/interface/data_channel_access.hh"
 
 using namespace nv;
@@ -322 +323 @@
 };
 
-mesh_data* nv::md3_loader::release_mesh_data( nv::size_t index )
-{
-        mesh_data* data = new mesh_data;
+data_channel_set* nv::md3_loader::release_mesh_data( nv::size_t index )
+{
+        data_channel_set* data = data_channel_set_creator::create(3);
         release_mesh_frame( data, -1, static_cast< sint32 >( index ) );
         return data;
 }
 
-void nv::md3_loader::release_mesh_frame( mesh_data* data, sint32 frame, sint32 surface )
+void nv::md3_loader::release_mesh_frame( data_channel_set* data, sint32 frame, sint32 surface )
 {
         md3_t* md3 = reinterpret_cast< md3_t* >( m_md3 );
@@ -412 +413 @@
         }
 
-        data->set_name( reinterpret_cast< char* >( md3->header.name ) );
-        data->add_channel( mc_pn.release() );
-        data->add_channel( mc_t.release() );
-        data->add_channel( ic.release() );
+        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() );
 }
 
@@ -436 +438 @@
         
                 raw_data_channel* keys = load_tags( name );
-                nodes[i].data->add_channel( keys );
+                nodes[i].data->add_key_channel( keys );
         }
         return new mesh_nodes_data( "tags", node_count, nodes );
@@ -445 +447 @@
         md3_t* md3 = reinterpret_cast<md3_t*>( m_md3 );
         int count = 1;
-        mesh_data* data = nullptr;
+        data_channel_set* data = nullptr;
         if ( m_merge_all )
         {
-                data = new mesh_data[1];
+                data = data_channel_set_creator::create_array(1,3);
                 release_mesh_frame( &data[0], -1, -1 );
-                data[0].set_name( reinterpret_cast< char* >( md3->header.name ) );
+                data_channel_set_creator( &data[0] ).set_name( reinterpret_cast< char* >( md3->header.name ) );
         }
         else
         {
                 count = md3->header.num_surfaces;
-                data = new mesh_data[ count ];
+                data = data_channel_set_creator::create_array( count, 3 );
                 for ( int i = 0; i < count; ++i )
                 {
                         release_mesh_frame( &data[i], -1, i );
-                        data[i].set_name( reinterpret_cast< char* >( md3->surfaces[i].header.name ) );
+                        data_channel_set_creator( &data[i] ).set_name( reinterpret_cast< char* >( md3->surfaces[i].header.name ) );
                 }
         }