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

Timestamp:

07/23/14 20:36:44 (11 years ago)

Author:

epyon

Message:

• merged md5 animation loader into md5_loader
• all animation now handled through the node system
• much cleanups

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -18 +18 @@
         m_pntdata.assign( (const md5_vtx_pnt*)pnt_chan->data, pnt_chan->count );
         m_bone_offset.resize( bones->get_count() );
+        m_transform.resize( bones->get_count() );
+
         for ( uint32 i = 0; i < bones->get_count(); ++i )
         {
@@ -32 +34 @@
         {
                 skeletal_animation_entry * anim = (skeletal_animation_entry*)a_anim;
-                float frame_duration = 1000.f / (float)anim->get_frame_rate();
-                float anim_duration = frame_duration * anim->get_duration();
-                float new_time = fmodf( (float)a_anim_time, anim_duration );
-                anim->update_skeleton( m_transform.data(), new_time * 0.001f );
-
-                //m_mesh_data->apply( m_transform.data() );
+                anim->update_skeleton( m_transform.data(), (float)a_anim_time );
                 {
                         size_t skeleton_size = m_bone_offset.size();
@@ -72 +69 @@
 }
 
+
+void nv::skeletal_animation_entry::update_skeleton( transform* skeleton, float time ) const
+{
+        float frame_duration = 1000.f / (float)m_node_data->get_frame_rate();
+        float anim_duration = frame_duration * m_node_data->get_duration();
+        float new_time = fmodf( time, anim_duration ) * 0.001f;
+
+        float frame_num = new_time * m_node_data->get_frame_rate();
+        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 );
+        }
+}
+
+
+
 nv::skeletal_mesh::~skeletal_mesh()
 {
@@ -81 +94 @@
         if ( a_anim != nullptr )
         {
-                skeletal_animation_entry * anim = (skeletal_animation_entry*)(a_anim);
-                m_transform.resize( anim->get_num_joints() );
                 update_animation( a_anim, 0 );
         }