Changeset 416 for trunk/src/formats/obj_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/obj_loader.cc (modified) (4 diffs)

trunk/src/formats/obj_loader.cc

@@ -7 +7 @@
 #include "nv/formats/obj_loader.hh"
 #include "nv/io/std_stream.hh"
+#include "nv/interface/data_channel_access.hh"
+
 #include <sstream>
 
@@ -330 +332 @@
                 }
 
-                mesh_data* mesh = new mesh_data(reader->name);
-                mesh->add_channel( channel.release() );
-                m_meshes.push_back( mesh );
+                data_channel_set_creator result;// ( reader->name );
+                result.add_channel( channel.release() );
+                m_meshes.push_back( result.release() );
 
                 reader->reset();
@@ -341 +343 @@
 }
 
-mesh_data* nv::obj_loader::release_mesh_data( size_t index )
-{
-        mesh_data* result = m_meshes[ index ];
+data_channel_set* nv::obj_loader::release_mesh_data( size_t index )
+{
+        data_channel_set* result = m_meshes[ index ];
         m_meshes[ index ] = nullptr;
         return result;
@@ -356 +358 @@
 {
         uint32 size = m_meshes.size();
-        mesh_data* meshes = new mesh_data[ size ];
+        data_channel_set* meshes = data_channel_set_creator::create_array( size, 1 );
         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];
         }