Changeset 480 for trunk/src/gfx/skeleton_instance.cc

Timestamp:

11/03/15 19:06:23 (10 years ago)

Author:

epyon

Message:

• cleanup of legacy code
• resource updates

File:

• trunk/src/gfx/skeleton_instance.cc (modified) (2 diffs)

trunk/src/gfx/skeleton_instance.cc

@@ -6 +6 @@
 
 #include "nv/gfx/skeleton_instance.hh"
+
+#include "nv/core/profiler.hh"
 
 void nv::skeleton_binding::prepare( const mesh_nodes_data* node_data, const mesh_nodes_data* bone_data )
@@ -62 +64 @@
                         for ( uint32 n = 0; n < node_data->size(); ++n )
                                 if ( ( *node_data )[n]->get_parent_id() == -1 )
-                                        animate_rec( node_data, binding, frame, n, mat4() );
+                                        animate_rec( node_data, binding, frame, n, transform() );
                 }
         }
 }
 
-void nv::skeleton_instance::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const mat4& parent ) 
+void nv::skeleton_instance::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const transform& parent )
 {
         // TODO: fix transforms, which are now embedded,
         //       see note in assimp_loader.cc:load_node
         const data_channel_set* node = ( *node_data )[id];
-        mat4 node_mat( node->get_transform() );
+        transform node_mat( node->get_transform() );
 
         if ( node->size() > 0 )
         {
                 raw_channel_interpolator interpolator( node, binding.m_key );
-                node_mat = interpolator.get< mat4 >( frame );
+                node_mat = interpolator.get< transform >( frame );
         }
 
-        mat4 global_mat = parent * node_mat;
+        transform global_mat = parent * node_mat;
 
         sint16 bone_id = binding.m_indices[id];
         if ( bone_id >= 0 )
         {
-                m_transform[bone_id] = global_mat * binding.m_offsets[bone_id];
+                m_transform[bone_id] = global_mat.extract() * binding.m_offsets[bone_id];
         }