Changeset 411 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/09/15 12:19:30 (10 years ago)

Author:

epyon

Message:

• mesh_raw_channel and key_raw_channel merged into raw_data_channel

File:

• trunk/src/formats/assimp_loader.cc (modified) (4 diffs)

trunk/src/formats/assimp_loader.cc

@@ -118 +118 @@
 
         bool skinned = mesh->mNumBones > 0;
-        mesh_raw_channel* channel = nullptr;
+        raw_data_channel* channel = nullptr;
         if ( skinned )
-                channel = mesh_raw_channel::create< assimp_skinned_vtx >( mesh->mNumVertices );
+                channel = raw_data_channel::create< assimp_skinned_vtx >( mesh->mNumVertices );
         else
-                channel = mesh_raw_channel::create< assimp_plain_vtx >( mesh->mNumVertices );
+                channel = raw_data_channel::create< assimp_plain_vtx >( mesh->mNumVertices );
 
         data->add_channel( channel );
@@ -169 +169 @@
         }
 
-        mesh_raw_channel* ichannel = mesh_raw_channel::create_index( USHORT, mesh->mNumFaces * 3 );
+        raw_data_channel* ichannel = raw_data_channel::create_index( USHORT, mesh->mNumFaces * 3 );
         data->add_channel( ichannel );
         uint16* indices = reinterpret_cast<uint16*>( ichannel->data );
@@ -315 +315 @@
                         if ( m > 0 && bones.size() > 0 )
                         {
-                                mesh_raw_channel* channel = meshes[m].get_raw_channels()[0];
+                                raw_data_channel* channel = meshes[m].get_raw_channels()[0];
                                 assimp_skinned_vtx* va = reinterpret_cast< assimp_skinned_vtx* >( channel->data );
                                 for ( unsigned v = 0; v < channel->count; ++v )
@@ -418 +418 @@
 
         data->data = new key_data;
-        key_raw_channel* raw_pchannel = key_raw_channel::create<assimp_key_p>( node->mNumPositionKeys );
-        key_raw_channel* raw_rchannel = key_raw_channel::create<assimp_key_r>( node->mNumRotationKeys );
-        //key_raw_channel* raw_schannel = key_raw_channel::create<assimp_key_s>( node->mNumScalingKeys );
+        raw_data_channel* raw_pchannel = raw_data_channel::create<assimp_key_p>( node->mNumPositionKeys );
+        raw_data_channel* raw_rchannel = raw_data_channel::create<assimp_key_r>( node->mNumRotationKeys );
+        //raw_data_channel* raw_schannel = raw_data_channel::create<assimp_key_s>( node->mNumScalingKeys );
         data->data->add_channel( raw_pchannel );
         data->data->add_channel( raw_rchannel );