Changeset 481 for trunk/src/gfx

Timestamp:

11/09/15 19:55:25 (10 years ago)

Author:

epyon

Message:

• skeleton/resource updates

File:

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

trunk/src/gfx/skeleton_instance.cc

@@ -11 +11 @@
 void nv::skeleton_binding::prepare( const mesh_nodes_data* node_data, const mesh_nodes_data* bone_data )
 {
-        if ( !m_offsets || !m_indices )
+        if ( m_indices.empty() )
         {
                 // TODO: either fixed size struct or static allocator
                 hash_store< shash64, uint16 > bone_names;
-                m_offsets = new mat4[bone_data->size()];
-                m_indices = new sint16[node_data->size()];
-
+                m_indices.resize( node_data->size() );
+                
                 for ( nv::uint16 bi = 0; bi < bone_data->size(); ++bi )
                 {
                         const data_channel_set* bone = ( *bone_data )[bi];
                         bone_names[bone->get_name()] = bi;
-                        m_offsets[bi] = bone->get_transform();
                 }
 
@@ -38 +36 @@
 
                 }
+                m_bone_count = bone_data->size();
         }
 
@@ -50 +49 @@
         }
 
+
 }
 
-void nv::skeleton_instance::animate( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame )
+// void nv::skeleton_instance::animate_( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame )
+// {
+//      if ( m_matrix.size() > 0 )
+//      {
+//              if ( node_data->is_flat() )
+//              {
+//                      animate_flat( node_data, binding, frame );
+//              }
+//              else
+//              {
+//                      for ( uint32 n = 0; n < node_data->size(); ++n )
+//                              if ( ( *node_data )[n]->get_parent_id() == -1 )
+//                                      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 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];
+//      transform node_mat( node->get_transform() );
+// 
+//      if ( node->size() > 0 )
+//      {
+//              raw_channel_interpolator interpolator( node, binding.m_key );
+//              node_mat = interpolator.get< transform >( frame );
+//      }
+// 
+//      transform global_mat = parent * node_mat;
+// 
+//      sint16 bone_id = binding.m_indices[id];
+//      if ( bone_id >= 0 )
+//      {
+//              m_matrix[bone_id] = global_mat.extract() * binding.m_offsets[bone_id];
+//      }
+// 
+//      for ( auto child : node_data->children( id ) )
+//      {
+//              animate_rec( node_data, binding, frame, child, global_mat );
+//      }
+// }
+// 
+// void nv::skeleton_instance::animate_flat( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame ) 
+// {
+//      for ( uint32 n = 0; n < node_data->size(); ++n )
+//              if ( binding.m_indices[n] >= 0 )
+//              {
+//                      const data_channel_set* node = ( *node_data )[n];
+//                      nv::mat4 node_mat( node->get_transform() );
+// 
+//                      if ( node->size() > 0 )
+//                      {
+//                              raw_channel_interpolator interpolator( node, binding.m_key );
+//                              node_mat = interpolator.get< mat4 >( frame );
+//                      }
+//                      sint16 bone_id = binding.m_indices[n];
+//                      m_matrix[bone_id] = node_mat * binding.m_offsets[bone_id];
+//              }
+// }
+
+void nv::skeleton_instance::assign( const skeleton_transforms& skeleton, const bone_transforms& bones )
 {
-        if ( m_transform.size() > 0 )
-        {
-                if ( node_data->is_flat() )
-                {
-                        animate_flat( node_data, binding, frame );
-                }
-                else
-                {
-                        for ( uint32 n = 0; n < node_data->size(); ++n )
-                                if ( ( *node_data )[n]->get_parent_id() == -1 )
-                                        animate_rec( node_data, binding, frame, n, transform() );
-                }
-        }
+        if ( bones.size() != m_matrix.size() ) 
+                m_matrix.resize( bones.size() );
+        const transform* transforms = skeleton.transforms();
+        for ( uint32 n = 0; n < skeleton.size(); ++n )
+                m_matrix[n] = transforms[n].extract() * bones.m_offsets[n];
 }
 
-void nv::skeleton_instance::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const transform& parent )
+void nv::skeleton_instance::assign( const bone_transforms& bones )
 {
-        // TODO: fix transforms, which are now embedded,
-        //       see note in assimp_loader.cc:load_node
+        if ( bones.size() != m_matrix.size() )
+                m_matrix.resize( bones.size() );
+}
+
+void nv::skeleton_transforms::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const transform& parent )
+{
         const data_channel_set* node = ( *node_data )[id];
         transform node_mat( node->get_transform() );
@@ -81 +139 @@
                 node_mat = interpolator.get< transform >( frame );
         }
-
+        sint16 bone_id = binding.m_indices[id];
         transform global_mat = parent * node_mat;
-
-        sint16 bone_id = binding.m_indices[id];
         if ( bone_id >= 0 )
         {
-                m_transform[bone_id] = global_mat.extract() * binding.m_offsets[bone_id];
+                m_transforms[bone_id] = global_mat;
         }
-
         for ( auto child : node_data->children( id ) )
         {
@@ -96 +151 @@
 }
 
-void nv::skeleton_instance::animate_flat( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame ) 
+void nv::bone_transforms::prepare( const mesh_nodes_data* bone_data )
 {
-        for ( uint32 n = 0; n < node_data->size(); ++n )
-                if ( binding.m_indices[n] >= 0 )
+        if ( m_offsets.empty() )
+        {
+                m_offsets.resize( bone_data->size() );
+
+                for ( nv::uint16 bi = 0; bi < bone_data->size(); ++bi )
                 {
-                        const data_channel_set* node = ( *node_data )[n];
-                        nv::mat4 node_mat( node->get_transform() );
-
-                        if ( node->size() > 0 )
-                        {
-                                raw_channel_interpolator interpolator( node, binding.m_key );
-                                node_mat = interpolator.get< mat4 >( frame );
-                        }
-
-                        sint16 bone_id = binding.m_indices[n];
-                        m_transform[bone_id] = node_mat * binding.m_offsets[bone_id];
+                        const data_channel_set* bone = ( *bone_data )[bi];
+                        m_offsets[bi] = bone->get_transform();
                 }
+        }
 }