Changeset 419 for trunk/src/gfx/skeletal_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/skeletal_mesh.cc (modified) (6 diffs)

trunk/src/gfx/skeletal_mesh.cc

@@ -91 +91 @@
 
 
+void nv::skeletal_animation_entry_cpu::initialize()
+{
+        for ( size_t i = 0; i < m_node_data->get_count(); ++i )
+        {
+                if ( m_node_data->get_node( i )->data )
+                {
+                        m_interpolation_key = m_node_data->get_node( i )->data->get_interpolation_key();
+                        break;
+                }
+        }
+}
+
 void nv::skeletal_animation_entry_cpu::update_skeleton( transform* skeleton, float time ) const
 {
@@ -100 +112 @@
         for ( size_t i = 0; i < m_node_data->get_count(); ++i )
         {
-                skeleton[i] = m_node_data->get_node(i)->data->get_transform( frame_num );
+                raw_channel_interpolator interpolator( m_node_data->get_node( i )->data, m_interpolation_key );
+                skeleton[i] = interpolator.get< transform >( frame_num );
         }
 }
@@ -112 +125 @@
         m_bone_ids  = new sint16[ node_count ];
 
+        NV_ASSERT( m_node_data, "node data empty!" );
+
         if ( !m_node_data->is_flat() )
         {
@@ -146 +161 @@
                         if ( node->data )
                         {
-                                node_mat = node->data->get_matrix( anim_time );
+                                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+                                node_mat = interpolator.get< mat4 >( anim_time );
                         }
 
@@ -177 +193 @@
                 }
                 m_bone_ids[n] = bone_id;
+
+                if ( m_interpolation_key.size() == 0 && node->data )
+                        m_interpolation_key = node->data->get_interpolation_key();
+
         }
         m_prepared = true;
@@ -190 +210 @@
         if ( node->data )
         {
-                node_mat = node->data->get_matrix( time );
+                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+                node_mat = interpolator.get< mat4 >( time );
         }