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

Timestamp:

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

Author:

epyon

Message:

• animation time definition fixes

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -13 +13 @@
 void nv::skeletal_animation_entry::initialize()
 {
+        m_root      = uint32(-1);
         m_prepared  = false;
         m_children  = nullptr;
@@ -30 +31 @@
                                 m_children[ node->get_parent_id()].push_back( n );
                         }
-                }
-        }
-}
-
-void nv::skeletal_animation_entry::update_skeleton( mat4* data, uint32 time ) const
-{
-        float tick_time = ( time * 0.001f ) * m_frame_rate;
-        float anim_time = m_start;
-        if ( m_duration > 0.0f ) anim_time += fmodf( tick_time, m_duration );
+                        else
+                        {
+                                if ( m_root >= 0 )
+                                {
+                                        m_root = uint32( -2 );
+                                }
+                                else
+                                        m_root = n;
+                        }
+                }
+                NV_ASSERT( m_root != uint32( -1 ), "Animation without root!" );
+        }
+}
+
+void nv::skeletal_animation_entry::update_skeleton( mat4* data, uint32 a_ms_time ) const
+{
+        float  fframe   = ( a_ms_time * 0.001f ) * m_fps;
+        uint32 frame    = math::floor( fframe );
+        float  reminder = fframe - static_cast<float>( frame );
+        uint32 duration = get_frame_count();
+        if ( duration == 0 )
+        {
+                frame  = get_start_frame();
+                fframe = static_cast<float>( frame );
+        }
+        else if ( frame >= duration )
+        {
+                if ( is_looping() )
+                {
+                        frame  = frame % duration;
+                        fframe = static_cast<float>( frame ) + reminder;
+                }
+                else
+                {
+                        frame  = get_end_frame();
+                        fframe = static_cast<float>( frame );
+                }
+        }
 
         if ( !m_node_data->is_flat() )
         {
-                animate_rec( data, anim_time, 0, mat4() );
+                if ( m_root == uint32( -2 ) ) // multi-root
+                {
+                        for ( uint32 n = 0; n < m_node_data->size(); ++n )
+                                if ( ( *m_node_data )[n]->get_parent_id() == -1 )
+                                        animate_rec( data, fframe, n, mat4() );
+                }
+                else
+                        animate_rec( data, fframe, m_root, mat4() );
                 return;
         }
@@ -55 +92 @@
                         {
                                 raw_channel_interpolator interpolator( node, m_interpolation_key );
-                                node_mat = interpolator.get< mat4 >( anim_time );
+                                node_mat = interpolator.get< mat4 >( fframe );
                         }
 
@@ -66 +103 @@
 {
         if ( m_prepared ) return;
-        unordered_map< uint64, uint16 > bone_names;
+        nv::hash_store< shash64, uint16 > bone_names;
         m_offsets = new mat4[ bones->size() ];
         for ( nv::uint16 bi = 0; bi < bones->size(); ++bi )
         {
                 const data_channel_set* bone = (*bones)[ bi ];
-                bone_names[ bone->get_name().value() ] = bi;
+                bone_names[ bone->get_name() ] = bi;
                 m_offsets[bi] = bone->get_transform();
         }
@@ -80 +117 @@
                 sint16 bone_id = -1;
 
-                auto bi = bone_names.find( node->get_name().value() );
+                auto bi = bone_names.find( node->get_name() );
                 if ( bi != bone_names.end() )
                 {
@@ -129 +166 @@
 
 nv::skeletal_mesh::skeletal_mesh( context* a_context, const data_channel_set* a_mesh, const mesh_nodes_data* a_bone_data )
-        : m_context( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_transform( nullptr )
+        : m_context( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_transform( nullptr ), m_parent_id(-1)
 {
         if ( a_mesh )
@@ -135 +172 @@
                 m_va = a_context->create_vertex_array( a_mesh, nv::STATIC_DRAW );
                 m_index_count = a_mesh->get_channel_size( slot::INDEX );
+                m_parent_id = a_mesh->get_parent_id();
         }
         if ( m_bone_data )