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

Timestamp:

07/10/14 20:58:27 (11 years ago)

Author:

epyon

Message:

• Nova Model Data format loader added
• keyframed mesh and skeletal mesh don't store time info anymore
• NMD loader has a temporary utility class for fast usage

File:

• trunk/src/gfx/keyframed_mesh.cc (modified) (6 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -23 +23 @@
         , m_last_frame( 0 )
         , m_next_frame( 0 )
-        , m_time( 0 )
         , m_fps( 0 )
         , m_interpolation( 0.0f )
@@ -56 +55 @@
         m_fps           = fps;
         m_active        = count > 1;
-        m_time          = 0;
         m_last_frame    = start;
         m_next_frame    = (count > 1 ? start + 1 : start );
@@ -70 +68 @@
 }
 
-void keyframed_mesh::update( uint32 ms )
+void nv::keyframed_mesh::update_animation( animation_entry*, uint32 a_anim_time )
 {
         if ( m_active )
         {
-                m_time += ms;
                 uint32 f_diff = (m_stop_frame - m_start_frame);
-                float f_time  = 1000 / (float)m_fps;
+                float  f_time = 1000 / (float)m_fps;
                 float f_max   = ( m_looping ? ( f_diff + 1 ) : f_diff ) * f_time;
-                float f_pos   = m_time / f_time;
-
-                m_last_frame    = (uint32)glm::floor( f_pos ) + m_start_frame;
-                m_next_frame    = m_last_frame + 1;
-                if ( m_next_frame > m_stop_frame )
-                {
-                        m_next_frame = m_start_frame;
-                }
-
-                if ( m_time >= f_max )
+                uint32 time   = a_anim_time;
+                if ( time >= f_max )
                 {
                         if ( m_looping )
                         {
-                                uint32 left = m_time - static_cast< uint32 >( f_max );
-                                m_time = 0;
-                                update( left );
+                                time = time % static_cast< uint32 >( f_max );
                         }
                         else
@@ -102 +89 @@
                         }
                 }
+                float f_pos   = time / f_time;
+
+                m_last_frame    = (uint32)glm::floor( f_pos ) + m_start_frame;
+                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 );
         }
 }
+
 
 void nv::keyframed_mesh::update( program* a_program ) const
@@ -148 +141 @@
 void nv::keyframed_mesh_gpu::update( uint32 ms )
 {
-        keyframed_mesh::update( ms );
+        animated_mesh::update( ms );
 
         if ( m_gpu_last_frame != m_last_frame )
@@ -181 +174 @@
 void nv::keyframed_mesh_cpu::update( uint32 ms )
 {
-        keyframed_mesh::update( ms );
+        animated_mesh::update( ms );
 
         const vertex_pn* data = m_mesh_data->get_channel_data<vertex_pn>();