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

Timestamp:

10/30/15 15:02:06 (10 years ago)

Author:

epyon

Message:

• resource system cleanups

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -15 +15 @@
 void nv::skeletal_animation_entry::update_skeleton( skeleton_instance& data, uint32 a_ms_time ) const
 {
-        float  fframe   = ( a_ms_time * 0.001f ) * m_fps;
-        uint32 frame    = uint32( math::floor( fframe ) );
-        float  reminder = fframe - static_cast<float>( frame );
+        float  fframe = ( a_ms_time * 0.001f ) * m_fps;
+        float  nframe = nv::floor( fframe );
         uint32 duration = get_frame_count();
         if ( duration == 0 )
         {
-                frame  = get_start_frame();
-                fframe = static_cast<float>( frame );
+                fframe = static_cast<float>( get_start_frame() );
         }
-        else if ( frame >= duration )
+        else if ( nframe >= duration )
         {
                 if ( is_looping() )
-                {
-                        frame  = frame % duration;
-                        fframe = static_cast<float>( frame ) + reminder;
-                }
+                        fframe = nv::fmodf( fframe, nv::f32( duration ) );
                 else
-                {
-                        frame  = get_end_frame();
-                        fframe = static_cast<float>( frame );
-                }
+                        fframe = static_cast<float>( get_end_frame() );
         }