Changeset 412 for trunk/src/gfx/keyframed_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/keyframed_mesh.cc (modified) (3 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -23 +23 @@
         , m_active( false )
 {
-        m_index_count  = m_mesh_data->get_index_channel()->count;
-        m_vertex_count = m_mesh_data->get_channel<vertex_t>()->count;
+        m_index_count  = m_mesh_data->get_index_channel()->element_count();
+        m_vertex_count = m_mesh_data->get_channel<vertex_t>()->element_count();
         m_vchannel     = m_mesh_data->get_channel<vertex_pnt>();
         m_vsize        = sizeof( vertex_pnt );
@@ -34 +34 @@
                 m_vsize        = sizeof( vertex_pn );
         }
-        m_frame_count  = m_vchannel->count / m_vertex_count;
+        m_frame_count  = m_vchannel->element_count() / m_vertex_count;
         m_pbuffer      = buffer();
 }
@@ -190 +190 @@
         m_context->add_vertex_buffers( m_va, vb, m_mesh_data->get_channel<vertex_t>() );
 
-        buffer  ib = m_context->get_device()->create_buffer( INDEX_BUFFER, STATIC_DRAW, m_mesh_data->get_index_channel()->size(), m_mesh_data->get_index_channel()->data );
-
-        m_context->set_index_buffer( m_va, ib, m_mesh_data->get_index_channel()->desc[0].etype, true );
+        const raw_data_channel* index_channel = m_mesh_data->get_index_channel();
+        buffer  ib = m_context->get_device()->create_buffer( INDEX_BUFFER, STATIC_DRAW, index_channel->raw_size(), index_channel->raw_data() );
+
+        m_context->set_index_buffer( m_va, ib, m_mesh_data->get_index_channel()->descriptor()[0].etype, true );
 
         m_data = new uint8[ m_vertex_count * m_vsize ];