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

Timestamp:

07/08/14 18:29:24 (11 years ago)

Author:

epyon

Message:

• unified mesh_raw_channel and mesh_raw_index_channel
• string_table cleaned up and implementation of creator split into a cc file

File:

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

trunk/src/formats/assimp_loader.cc

@@ -143 +143 @@
         }
 
-        mesh_raw_index_channel* ichannel = mesh_raw_index_channel::create( USHORT, mesh->mNumFaces * 3 );
-        result->set_index_channel( ichannel );
+        mesh_raw_channel* ichannel = mesh_raw_channel::create_index( USHORT, mesh->mNumFaces * 3 );
+        result->add_channel( ichannel );
         uint16* indices = (uint16*)ichannel->data;
         for (unsigned int i=0; i<mesh->mNumFaces; i++)
@@ -294 +294 @@
                 {
                         mesh_data* mesh = model->meshes[m];
-                        mesh_raw_channel* channel = mesh->get_channel_data()[0];
+                        mesh_raw_channel* channel = mesh->get_raw_channels()[0];
+                        NV_ASSERT( !channel->is_index(), "index channel in release_merged!" );
                         assimp_skinned_vtx* va = (assimp_skinned_vtx*)channel->data;
                         for ( unsigned v = 0; v < channel->count; ++v )