Changeset 280 for trunk/src/formats

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

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (2 diffs)
• md2_loader.cc (modified) (2 diffs)
• md3_loader.cc (modified) (2 diffs)
• md5_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (1 diff)

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 )

trunk/src/formats/md2_loader.cc

@@ -359 +359 @@
         }
 
-        mesh_raw_index_channel* ic = mesh_raw_index_channel::create< uint16 >( m_new_indexes.size() );
+        mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( m_new_indexes.size() );
         if ( m_new_indexes.size() > 0 )
         {
@@ -369 +369 @@
         result->add_channel( mc_pn );
         result->add_channel( mc_t );
-        result->set_index_channel( ic );
+        result->add_channel( ic );
         return result;
 }

trunk/src/formats/md3_loader.cc

@@ -377 +377 @@
         index = 0;
         sint32 index_base = 0;
-        mesh_raw_index_channel* ic = mesh_raw_index_channel::create< uint16 >( index_count );
+        mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( index_count );
         uint16* icp = (uint16*)ic->data;
         for ( sint32 i = 0; i < num_surfaces; ++i )
@@ -396 +396 @@
         result->add_channel( mc_pn );
         result->add_channel( mc_t );
-        result->set_index_channel( ic );
+        result->add_channel( ic );
         return result;
 }

trunk/src/formats/md5_loader.cc

@@ -145 +145 @@
                                         sstream >> num_tris;
 
-                                        mesh_raw_index_channel* ch_i = mesh_raw_index_channel::create<uint32>( num_tris * 3 );
+                                        mesh_raw_channel* ch_i = mesh_raw_channel::create_index<uint32>( num_tris * 3 );
                                         uint32* vtx_i                = (uint32*)ch_i->data;
                                         mesh->m_idata                = vtx_i;
                                         uint32 idx = 0;
-                                        mesh->set_index_channel( ch_i );
+                                        mesh->add_channel( ch_i );
 
                                         next_line( sstream );

trunk/src/formats/obj_loader.cc

@@ -334 +334 @@
                 channel->desc  = m_descriptor;
                 channel->count = reader->size * 3;
-                channel->size  = reader->raw_size();
 
                 mesh_data* mesh = new mesh_data();