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

Timestamp:

07/23/14 17:37:44 (11 years ago)

Author:

epyon

Message:

• unified animation_entry class
• virtuals removed from animation_entry
• lua_table - added missing get_float
• lua_table - fixed has_field

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -33 +33 @@
                 skeletal_animation_entry * anim = (skeletal_animation_entry*)a_anim;
                 float frame_duration = 1000.f / (float)anim->get_frame_rate();
-                uint32 anim_duration = uint32( frame_duration * (float)anim->get_frame_count() );
-                uint32 new_time = a_anim_time % anim_duration;
-                anim->update_skeleton( m_transform.data(), (float)new_time * 0.001f );
+                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() );
@@ -87 +87 @@
 }
 
-
-nv::skeletal_animation_entry_gpu::skeletal_animation_entry_gpu( const std::string& name, const mesh_nodes_data* anim, bool a_looping ) 
-        : animation_entry( name )
-        , m_node_data( anim )
-{
-        uint32 node_count = m_node_data->get_count();
-
+void nv::skeletal_animation_entry_gpu::initialize()
+{
         m_prepared  = false;
-        m_looping   = a_looping;
         m_children  = nullptr;
         m_offsets   = nullptr;
+        uint32 node_count = m_node_data->get_count();
         m_bone_ids  = new sint16[ node_count ];