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

Timestamp:

09/17/15 17:19:14 (10 years ago)

Author:

epyon

Message:

• animation time definition fixes

File:

• trunk/src/gfx/keyframed_mesh.cc (modified) (1 diff)

trunk/src/gfx/keyframed_mesh.cc

@@ -72 +72 @@
 }
 
-void nv::keyframed_mesh::update_animation( animation_entry* anim, uint32 a_anim_time )
+void nv::keyframed_mesh::update_animation( animation_entry* anim, uint32 a_ms_anim_time )
 {
         if ( m_active )
         {
-                float tick_time = ( static_cast<float>( a_anim_time ) * 0.001f ) * anim->get_frame_rate();
-                float duration  = anim->is_looping() ? anim->get_duration() + 1.0f : anim->get_duration();
-                if ( tick_time >= duration )
+                float  fframe   = ( static_cast<float>( a_ms_anim_time ) * 0.001f ) * anim->get_fps();
+                uint32 frame    = uint32( fframe );
+                float  reminder = fframe - static_cast<float>( frame );
+                uint32 duration = anim->is_looping() ? anim->get_frame_count() + 1 : anim->get_frame_count();
+
+                if ( frame >= duration )
                 {
                         if ( anim->is_looping() )
                         {
-                                tick_time = fmodf( tick_time, duration );
+                                frame  = frame % duration;
+                                fframe = static_cast<float>( frame ) + reminder;
                         }
                         else
                         {
-                                m_active     = false;
-                                m_last_frame = static_cast<uint32>( anim->get_end() );
-                                m_next_frame = m_last_frame;
+                                m_active        = false;
+                                m_last_frame    = anim->get_end_frame();
+                                m_next_frame    = m_last_frame;
                                 m_interpolation = 0.0f;
                                 return;
                         }
                 }
-                m_last_frame    = static_cast<uint32>( math::floor( tick_time ) + anim->get_start() );
+                m_last_frame    = frame + anim->get_start_frame();
                 m_next_frame    = m_last_frame + 1;
-                if ( m_next_frame > static_cast<uint32>( anim->get_end() ) ) m_next_frame = static_cast<uint32>( anim->get_start() );
-                m_interpolation = tick_time - math::floor( tick_time );
+                if ( m_next_frame > anim->get_end_frame() ) m_next_frame = anim->get_start_frame();
+                m_interpolation = reminder;
         }
 }