Changeset 287 for trunk/src/gfx/keyframed_mesh.cc

Timestamp:

07/23/14 15:24:03 (11 years ago)

Author:

epyon

Message:

• mesh_data_pack's in every format
• md5_mesh_data removed, uses standard mesh_data
• BONE_ARRAY in NMD is now a simple set of animation nodes
• bone and animation node concepts merged
• several minor changes

File:

• trunk/src/gfx/keyframed_mesh.cc (modified) (4 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -15 +15 @@
 using namespace nv;
 
-nv::keyframed_mesh::keyframed_mesh( device* a_device, mesh_data* a_data, tag_map* a_tag_map )
+nv::keyframed_mesh::keyframed_mesh( device* a_device, const mesh_data* a_data, const mesh_nodes_data* a_tag_map )
         : animated_mesh()
         , m_mesh_data( a_data )
@@ -40 +40 @@
 }
 
-transform keyframed_mesh::get_tag( uint32 tag ) const
+transform keyframed_mesh::get_node_transform( uint32 node_id ) const
 {
         NV_ASSERT( m_tag_map, "TAGMAP FAIL" );
-        const key_data* data = m_tag_map->get_tag( tag );
+        NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
+        const key_data* data = m_tag_map->get_node( node_id )->data;
         NV_ASSERT( data, "TAG FAIL" );
         transform last = data->get_raw_transform( m_last_frame );
         transform next = data->get_raw_transform( m_next_frame );
         return interpolate( last, next, m_interpolation  );
+}
+
+mat4 keyframed_mesh::get_node_matrix( uint32 node_id ) const
+{
+        return get_node_transform( node_id ).extract();
 }
 
@@ -125 +131 @@
 }
 
-nv::keyframed_mesh_gpu::keyframed_mesh_gpu( device* a_device, mesh_data* a_data, tag_map* a_tag_map, program* a_program )
+nv::keyframed_mesh_gpu::keyframed_mesh_gpu( device* a_device, const mesh_data* a_data, const mesh_nodes_data* a_tag_map, program* a_program )
         : keyframed_mesh( a_device, a_data, a_tag_map )
         , m_loc_next_position( 0 )
@@ -159 +165 @@
 }
 
-nv::keyframed_mesh_cpu::keyframed_mesh_cpu( device* a_device, mesh_data* a_data, tag_map* a_tag_map )
+nv::keyframed_mesh_cpu::keyframed_mesh_cpu( device* a_device, const mesh_data* a_data, const mesh_nodes_data* a_tag_map )
         : keyframed_mesh( a_device, a_data, a_tag_map )
 {