Changeset 412 for trunk/src/gfx/skeletal_mesh.cc

Timestamp:

07/09/15 14:40:36 (10 years ago)

Author:

epyon

Message:

• refactoring of raw_data_channel and data_descriptor access

File:

• trunk/src/gfx/skeletal_mesh.cc (modified) (2 diffs)

trunk/src/gfx/skeletal_mesh.cc

@@ -13 +13 @@
 nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
         : skeletal_mesh( a_context )
-        , m_data( a_mesh_data )
-{
-        const raw_data_channel* pnt_chan = a_mesh_data->get_channel<md5_vtx_pnt>();
-        m_pntdata.assign( reinterpret_cast<const md5_vtx_pnt*>( pnt_chan->data ), pnt_chan->count );
+{
+        const raw_data_channel* pnt_chan   = a_mesh_data->get_channel<md5_vtx_pnt>();
+        const raw_data_channel* pntiw_chan = a_mesh_data->get_channel<md5_vtx_pntiw>();
+
+        m_pntdata.assign( reinterpret_cast<const md5_vtx_pnt*>( pnt_chan->data ), pnt_chan->element_count() );
         m_bone_offset.resize( bones->get_count() );
         m_transform.resize( bones->get_count() );
@@ -24 +25 @@
                 m_bone_offset[i] = transform( bones->get_node(i)->transform );
         }
+
         m_vtx_data  = a_mesh_data->get_channel_data<md5_vtx_pntiw>();
         m_indices   = a_mesh_data->get_count();
-        m_va        = a_context->create_vertex_array( a_mesh_data, 
-STREAM_DRAW );
+        m_va        = a_context->create_vertex_array();
+
+        array_view< raw_data_channel* > channels = a_mesh_data->get_raw_channels();
+        for ( uint32 ch = 0; ch < channels.size(); ++ch )
+        {
+                const raw_data_channel* channel = channels[ch];
+                if ( channel->element_count() > 0 && channel != pntiw_chan )
+                {
+                        const data_descriptor& desc = channel->descriptor();
+                        if ( desc[0].vslot == slot::INDEX )
+                        {
+                                buffer b = a_context->get_device()->create_buffer( INDEX_BUFFER, STREAM_DRAW, channel->raw_size(), channel->raw_data() );
+                                a_context->set_index_buffer( m_va, b, desc[0].etype, true );
+                        }
+                        else
+                        {
+                                buffer b = a_context->get_device()->create_buffer( VERTEX_BUFFER, STREAM_DRAW, channel->raw_size(), channel->raw_data() );
+                                a_context->add_vertex_buffers( m_va, b, channel );
+                        }
+                }
+        }
+
         m_pbuffer   = a_context->find_buffer( m_va, slot::POSITION );
 }