Changeset 288 for trunk/src/gfx/keyframed_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/keyframed_mesh.cc (modified) (4 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -19 +19 @@
         , m_mesh_data( a_data )
         , m_tag_map( a_tag_map )
-        , m_start_frame( false )
-        , m_stop_frame( false )
         , m_last_frame( 0 )
         , m_next_frame( 0 )
-        , m_fps( 0 )
         , m_interpolation( 0.0f )
-        , m_looping( false )
         , m_active( false )
 {
@@ -56 +52 @@
 }
 
-void keyframed_mesh::setup_animation( uint32 start, uint32 count, uint32 fps, bool loop )
-{
-        m_start_frame   = start;
-        m_stop_frame    = start+count-1;
-        m_looping       = loop;
-        m_fps           = fps;
-        m_active        = count > 1;
-        m_last_frame    = start;
-        m_next_frame    = (count > 1 ? start + 1 : start );
-        m_interpolation = 0.0f;
-}
-
 void nv::keyframed_mesh::set_frame( uint32 frame )
 {
@@ -76 +60 @@
 }
 
-void nv::keyframed_mesh::update_animation( animation_entry*, uint32 a_anim_time )
+void nv::keyframed_mesh::update_animation( animation_entry* anim, uint32 a_anim_time )
 {
         if ( m_active )
         {
-                uint32 f_diff = (m_stop_frame - m_start_frame);
-                float  f_time = 1000 / (float)m_fps;
-                float f_max   = ( m_looping ? ( f_diff + 1 ) : f_diff ) * f_time;
-                uint32 time   = a_anim_time;
-                if ( time >= f_max )
+                float tick_time = ( (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 )
                 {
-                        if ( m_looping )
+                        if ( anim->is_looping() )
                         {
-                                time = time % static_cast< uint32 >( f_max );
+                                tick_time = fmodf( tick_time, duration );
                         }
                         else
                         {
                                 m_active     = false;
-                                m_last_frame = m_stop_frame;
-                                m_next_frame = m_stop_frame;
+                                m_last_frame = (uint32)anim->get_end();
+                                m_next_frame = m_last_frame;
+                                m_interpolation = 0.0f;
+                                return;
                         }
                 }
-                float f_pos   = time / f_time;
-
-                m_last_frame    = (uint32)glm::floor( f_pos ) + m_start_frame;
+                m_last_frame    = (uint32)( glm::floor( tick_time ) + anim->get_start() );
                 m_next_frame    = m_last_frame + 1;
-                if ( m_next_frame > m_stop_frame ) m_next_frame = m_start_frame;
-                m_interpolation = f_pos - glm::floor( f_pos );
+                if ( m_next_frame > (uint32)anim->get_end() ) m_next_frame = (uint32)anim->get_start();
+                m_interpolation = tick_time - glm::floor( tick_time );
         }
 }
@@ -121 +103 @@
         if ( a_anim )
         {
-                keyframed_animation_entry * anim = down_cast<keyframed_animation_entry>(a_anim);
-                m_active = true;
-                setup_animation( anim->m_start, anim->m_frames, anim->m_fps, anim->m_looping );
+                m_active        = true;
+                m_last_frame    = 0;
+                m_next_frame    = 0;
+                m_interpolation = 0.0f;
         }
         else