Changeset 417 for trunk/src/gfx/keyframed_mesh.cc

Timestamp:

07/10/15 19:50:47 (10 years ago)

Author:

epyon

Message:

• further access restrictions improvements

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_channel( slot::INDEX )->size();
-        m_vertex_count = m_mesh_data->get_channel<vertex_t>()->size();
-        m_vchannel     = m_mesh_data->get_channel<vertex_pnt>();
-        m_vsize        = sizeof( vertex_pnt );
-        m_has_tangent  = true;
-        if ( m_vchannel == nullptr )
-        {
-                m_vchannel     = m_mesh_data->get_channel<vertex_pn>();
-                m_has_tangent  = false;
-                m_vsize        = sizeof( vertex_pn );
-        }
-        m_frame_count  = m_vchannel->size() / m_vertex_count;
+        m_index_count   = m_mesh_data->get_channel_size( slot::INDEX );
+        m_vertex_count  = m_mesh_data->get_channel_size<vertex_t>();
+        uint32 pos_size = m_mesh_data->get_channel_size<vertex_pnt>();
+        if ( pos_size == 0 )
+        {
+                pos_size      = m_mesh_data->get_channel_size<vertex_pn>();
+                m_has_tangent = false;
+                m_vsize       = sizeof( vertex_pn );
+        }
+        else
+        {
+                m_has_tangent = true;
+                m_vsize       = sizeof( vertex_pnt );
+        }
+        m_frame_count  = pos_size / m_vertex_count;
         m_pbuffer      = buffer();
 }
@@ -47 +50 @@
         if ( !m_tag_map ) return transform();
         NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
-        const key_data* data = m_tag_map->get_node( node_id )->data;
+        const key_channel_set* data = m_tag_map->get_node( node_id )->data;
         NV_ASSERT( data, "TAG FAIL" );
         transform last = data->get_raw_transform( m_last_frame );
@@ -183 +186 @@
         : keyframed_mesh( a_context, a_data, a_tag_map )
 {
+        const raw_data_channel* vchannel = m_has_tangent ? a_data->get_channel< vertex_pnt >() : a_data->get_channel< vertex_pn >();
         m_va      = m_context->create_vertex_array();
-        m_pbuffer = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * m_vsize, m_vchannel->raw_data() );
-        m_context->add_vertex_buffers( m_va, m_pbuffer, m_vchannel );
+        m_pbuffer = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * m_vsize, vchannel->raw_data() );
+        m_context->add_vertex_buffers( m_va, m_pbuffer, vchannel->descriptor() );
 
         buffer  vb = m_context->get_device()->create_buffer( VERTEX_BUFFER, STATIC_DRAW, m_vertex_count * sizeof( vec2 ), m_mesh_data->get_channel_data<vertex_t>() );
-        m_context->add_vertex_buffers( m_va, vb, m_mesh_data->get_channel<vertex_t>() );
+        m_context->add_vertex_buffers( m_va, vb, m_mesh_data->get_channel<vertex_t>()->descriptor() );
 
         const raw_data_channel* index_channel = m_mesh_data->get_channel( slot::INDEX );