Changeset 280 for trunk/src

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

Files:

• formats/assimp_loader.cc (modified) (2 diffs)
• formats/md2_loader.cc (modified) (2 diffs)
• formats/md3_loader.cc (modified) (2 diffs)
• formats/md5_loader.cc (modified) (1 diff)
• formats/obj_loader.cc (modified) (1 diff)
• gfx/keyframed_mesh.cc (modified) (3 diffs)
• io/string_table.cc (added)

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();

trunk/src/gfx/keyframed_mesh.cc

@@ -32 +32 @@
 
         m_index_count  = m_mesh_data->get_index_channel()->count;
-        m_vertex_count = m_mesh_data->get_channel_data()[1]->count;
-        m_frame_count  = m_mesh_data->get_channel_data()[0]->count / m_vertex_count;
+        m_vertex_count = m_mesh_data->get_channel<vertex_t>()->count;
+        m_frame_count  = m_mesh_data->get_channel<vertex_pn>()->count / m_vertex_count;
 }
 
@@ -167 +167 @@
         : keyframed_mesh( a_device, a_data, a_tag_map )
 {
-        m_vb = a_device->create_vertex_buffer( nv::STATIC_DRAW, m_vertex_count * sizeof( vertex_pn ), (void*)m_mesh_data->get_channel_data()[0]->data );
-        m_va->add_vertex_buffers( m_vb, m_mesh_data->get_channel_data()[0] );
+        m_vb = a_device->create_vertex_buffer( nv::STATIC_DRAW, m_vertex_count * sizeof( vertex_pn ), (void*)m_mesh_data->get_channel<vertex_pn>()->data );
+        m_va->add_vertex_buffers( m_vb, m_mesh_data->get_channel<vertex_pn>() );
 
-        nv::vertex_buffer* vb = a_device->create_vertex_buffer( nv::STATIC_DRAW, m_vertex_count * sizeof( nv::vec2 ), (void*)m_mesh_data->get_channel_data()[1]->data );
-        m_va->add_vertex_buffers( vb, m_mesh_data->get_channel_data()[1] );
+        nv::vertex_buffer* vb = a_device->create_vertex_buffer( nv::STATIC_DRAW, m_vertex_count * sizeof( nv::vec2 ), (void*)m_mesh_data->get_channel<vertex_t>()->data );
+        m_va->add_vertex_buffers( vb, m_mesh_data->get_channel<vertex_t>() );
 
-        nv::index_buffer* ib = a_device->create_index_buffer( nv::STATIC_DRAW, m_mesh_data->get_index_channel()->size, (void*)m_mesh_data->get_index_channel()->data );
-        m_va->set_index_buffer( ib, m_mesh_data->get_index_channel()->etype, true );
+        nv::index_buffer* ib = a_device->create_index_buffer( nv::STATIC_DRAW, m_mesh_data->get_index_channel()->size(), (void*)m_mesh_data->get_index_channel()->data );
+        m_va->set_index_buffer( ib, m_mesh_data->get_index_channel()->desc.slots[0].etype, true );
 
         m_vertex.resize( m_vertex_count );
@@ -183 +183 @@
         keyframed_mesh::update( ms );
 
-        const vertex_pn* data = (const vertex_pn*)(m_mesh_data->get_channel_data()[0]->data);
+        const vertex_pn* data = m_mesh_data->get_channel_data<vertex_pn>();
         const vertex_pn* prev = data + m_vertex_count * m_last_frame;
         const vertex_pn* next = data + m_vertex_count * m_next_frame;