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

Timestamp:

10/23/15 19:35:39 (10 years ago)

Author:

epyon

Message:

• resource handling rewrite
• skeletal_mesh/mesh_data updates

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -13 +13 @@
 #include "nv/core/logging.hh"
 
-void nv::skeletal_animation_entry::update_skeleton( mat4* data, uint32 a_ms_time ) const
+void nv::skeletal_animation_entry::update_skeleton( skeleton_instance& data, uint32 a_ms_time ) const
 {
         float  fframe   = ( a_ms_time * 0.001f ) * m_fps;
@@ -38 +38 @@
         }
 
-        m_data.animate( data, fframe );
+        if ( data.size() == 0 )
+                data.initialize( m_temp_anim->size() );
+        data.animate( m_temp_anim, m_data, fframe );
 }
 
 void nv::skeletal_animation_entry::prepare( const mesh_nodes_data* bones )
 {
-        m_data.prepare( bones );
+        m_data.prepare( m_temp_anim, bones ? bones : m_temp_anim );
 }
 
 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_parent_id(-1)
+        : m_skeleton( a_bone_data ? a_bone_data->size() : 0 ), m_context( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_parent_id(-1)
 {
         if ( a_mesh )
@@ -55 +57 @@
                 m_parent_id = a_mesh->get_parent_id();
         }
-        if ( m_bone_data )
-        {
-                m_transform = new mat4[ m_bone_data->size() ];
-        }
 }
 
-void nv::skeletal_mesh::update_animation( animation_entry* a_anim, uint32 a_anim_time )
+void nv::skeletal_mesh::update_animation( animation_entry& a_anim, uint32 a_anim_time )
 {
-        if ( m_bone_data && a_anim )
-        {
-                skeletal_animation_entry * anim = static_cast<skeletal_animation_entry*>( a_anim );
-                anim->prepare( m_bone_data );
-                anim->update_skeleton( m_transform, a_anim_time );
-        }
+        skeletal_animation_entry& anim = static_cast<skeletal_animation_entry&>( a_anim );
+        anim.prepare( m_bone_data );
+        anim.update_skeleton( m_skeleton, a_anim_time );
 }
 
-void nv::skeletal_mesh::update( program a_program )
+void nv::skeletal_mesh::update_program( program a_program )
 {
-        if ( m_bone_data )
-                m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_transform, m_bone_data->size() );
+        m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_skeleton.transforms(), m_skeleton.size() );
 }
 
 nv::transform nv::skeletal_mesh::get_node_transform( uint32 node_id ) const
 {
-        return transform( m_transform[ node_id ] );
+        return transform( get_node_matrix( node_id ) );
 }
 
 nv::mat4 nv::skeletal_mesh::get_node_matrix( uint32 node_id ) const
 {
-        return m_transform[ node_id ];
+        return m_skeleton.transforms()[ node_id ];
 }