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

Timestamp:

07/14/15 20:19:52 (10 years ago)

Author:

epyon

Message:

• animation - key_channel_set simplified to data_channel_set
• animation - raw_channel_interpolator

File:

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

trunk/src/gfx/keyframed_mesh.cc

@@ -39 +39 @@
         m_frame_count  = pos_size / m_vertex_count;
         m_pbuffer      = buffer();
+
+        if ( m_tag_map && m_tag_map->get_count() > 0 )
+        {
+                m_interpolation_key = m_tag_map->get_node( 0 )->data->get_interpolation_key();
+        }
 }
 
@@ -50 +55 @@
         if ( !m_tag_map ) return transform();
         NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
-        const key_channel_set* data = m_tag_map->get_node( node_id )->data;
+        const data_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 );
-        transform next = data->get_raw_transform( m_next_frame );
-        return interpolate( last, next, m_interpolation  );
+        raw_channel_interpolator interpolator( data, m_interpolation_key );
+        return interpolator.get< transform >( m_last_frame, m_next_frame, m_interpolation );
 }