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

trunk/src/formats/assimp_loader.cc

@@ -6 +6 @@
 
 #include "nv/formats/assimp_loader.hh"
+
+#include "nv/interface/data_channel_access.hh"
 #include "nv/stl/unordered_map.hh"
 #include "nv/lib/assimp.hh"
@@ -103 +105 @@
 }
 
-mesh_data* nv::assimp_loader::release_mesh_data( size_t index /*= 0 */ )
+data_channel_set* nv::assimp_loader::release_mesh_data( size_t index /*= 0 */ )
 {
         if ( index >= m_mesh_count ) return nullptr;
-        mesh_data* result = new mesh_data;
+        data_channel_set* result = data_channel_set_creator::create( 2 );
         load_mesh_data( result, index );
         return result;
 }
-void nv::assimp_loader::load_mesh_data( mesh_data* data, size_t index )
+void nv::assimp_loader::load_mesh_data( data_channel_set* data, size_t index )
 {
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         const aiMesh*  mesh  = scene->mMeshes[ index ];
-        data->set_name( mesh->mName.data );
 
         bool skinned = mesh->mNumBones > 0;
@@ -180 +181 @@
                 }
         }
-        data->add_channel( channel.release() );
-        data->add_channel( ichannel.release() );
+
+        data_channel_set_creator maccess( data );
+        maccess.set_name( mesh->mName.data );
+        maccess.add_channel( channel.release() );
+        maccess.add_channel( ichannel.release() );
 }
 
@@ -283 +287 @@
 }
 
-mesh_nodes_data* nv::assimp_loader::release_merged_bones( mesh_data* meshes )
+mesh_nodes_data* nv::assimp_loader::release_merged_bones( data_channel_set* meshes )
 {
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
@@ -317 +321 @@
                         if ( m > 0 && bones.size() > 0 )
                         {
-                                data_channel_creator< assimp_skinned_vtx > channel( meshes[m].get_raw_channels()[0] );
+                                data_channel_creator< assimp_skinned_vtx > channel( const_cast< raw_data_channel* >( meshes[m].get_channel(0) ) );
                                 for ( unsigned v = 0; v < channel.size(); ++v )
                                 {
@@ -456 +460 @@
 //              }
 //      }
-        data->data->add_channel( pchannel_creator.release() );
-        data->data->add_channel( rchannel_creator.release() );
-//      data->data->add_channel( schannel_creator.release() );
+        data->data->add_key_channel( pchannel_creator.release() );
+        data->data->add_key_channel( rchannel_creator.release() );
+//      data->data->add_key_channel( schannel_creator.release() );
 }
 
@@ -466 +470 @@
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         bool has_bones = false;
-        mesh_data* meshes = new mesh_data[ m_mesh_count ];
+        data_channel_set* meshes = data_channel_set_creator::create_array( m_mesh_count, 2 );
         for ( size_t m = 0; m < m_mesh_count; ++m )
         {
                 const aiMesh* mesh = scene->mMeshes[ m ];
-                meshes[m].set_name( mesh->mName.data );
+                data_channel_set_creator( &meshes[m] ).set_name( mesh->mName.data );
                 if ( mesh->mNumBones > 0 ) has_bones = true;
                 load_mesh_data(&meshes[m],m);