Changeset 419 for trunk/src/gfx

Timestamp:

07/14/15 20:19:52 (10 years ago)

Author:

epyon

Message:

• animation - key_channel_set simplified to data_channel_set
• animation - raw_channel_interpolator

Location:

trunk/src/gfx

Files:

• keyframed_mesh.cc (modified) (2 diffs)
• mesh_creator.cc (modified) (7 diffs)
• skeletal_mesh.cc (modified) (6 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -39 +39 @@
         m_frame_count  = pos_size / m_vertex_count;
         m_pbuffer      = buffer();
+
+        if ( m_tag_map && m_tag_map->get_count() > 0 )
+        {
+                m_interpolation_key = m_tag_map->get_node( 0 )->data->get_interpolation_key();
+        }
 }
 
@@ -50 +55 @@
         if ( !m_tag_map ) return transform();
         NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
-        const key_channel_set* data = m_tag_map->get_node( node_id )->data;
+        const data_channel_set* 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  );
+        raw_channel_interpolator interpolator( data, m_interpolation_key );
+        return interpolator.get< transform >( m_last_frame, m_next_frame, m_interpolation );
 }
 

trunk/src/gfx/mesh_creator.cc

@@ -19 +19 @@
         {
                 sint16 parent_id = m_data->m_nodes[i].parent_id;
-                key_channel_set* keys   = m_data->m_nodes[i].data;
-                key_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_nodes[parent_id].data : nullptr );
+                data_channel_set* keys   = m_data->m_nodes[i].data;
+                data_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_nodes[parent_id].data : nullptr );
                 size_t count     = ( keys ? keys->get_channel_size(0) : 0 );
                 size_t pcount    = ( pkeys ? pkeys->get_channel_size(0) : 0 );
@@ -46 +46 @@
 }
 
-// TODO: DELETE
-struct assimp_key_p  { float time; nv::vec3 position; };
-struct assimp_key_r  { float time; nv::quat rotation; };
-
 
 void nv::mesh_nodes_creator::merge_keys()
@@ -55 +51 @@
         for ( size_t i = 0; i < m_data->get_count(); ++i )
         {
-                key_channel_set* old_keys = m_data->m_nodes[i].data;
+                data_channel_set* old_keys = m_data->m_nodes[i].data;
                 if ( old_keys && old_keys->size() > 0 )
                 {
@@ -69 +65 @@
                         }
 
-                        key_channel_set* new_keys = key_channel_set_creator::create( 1 );
-                        key_channel_set_creator nk_access( new_keys );
+                        data_channel_set* new_keys = data_channel_set_creator::create( 1 );
+                        data_channel_set_creator nk_access( new_keys );
                         data_channel_access< nv_key_transform > kt_channel( nk_access.add_channel<nv_key_transform>( max_keys ) );
 
-                        data_descriptor final_key = old_keys->get_final_key();
+                        raw_channel_interpolator interpolator( old_keys );
+                        data_descriptor final_key = interpolator.get_interpolation_key();
 
                         for ( unsigned n = 0; n < max_keys; ++n )
@@ -83 +80 @@
                                 {
                                         size_t idx = nv::min( old_keys->get_channel_size(c) - 1, n );
-                                        pkey += old_keys->get_raw( *old_keys->get_channel(c), idx, pkey );
-                                }
-                                kt_channel.data()[n].tform = extract_transform_raw( final_key, key );
+                                        pkey += raw_channel_interpolator::get_raw( *old_keys->get_channel(c), idx, pkey );
+                                }
+                                kt_channel.data()[n].tform = extract_key_raw< nv::transform >( final_key, key );
                         }
 
@@ -106 +103 @@
                 if ( node.data )
                 {
-                        key_channel_set* kdata  = node.data;
+                        data_channel_set* kdata  = node.data;
                         for ( size_t c = 0; c < kdata->size(); ++c )
                         {
@@ -332 +329 @@
                 }
         }
-        delete tangents2;
+        delete[] tangents2;
 
         data_channel_set_creator( m_data ).set_channel( n_channel_index, merge_channels( *n_channel, g_channel ) );

trunk/src/gfx/skeletal_mesh.cc

@@ -91 +91 @@
 
 
+void nv::skeletal_animation_entry_cpu::initialize()
+{
+        for ( size_t i = 0; i < m_node_data->get_count(); ++i )
+        {
+                if ( m_node_data->get_node( i )->data )
+                {
+                        m_interpolation_key = m_node_data->get_node( i )->data->get_interpolation_key();
+                        break;
+                }
+        }
+}
+
 void nv::skeletal_animation_entry_cpu::update_skeleton( transform* skeleton, float time ) const
 {
@@ -100 +112 @@
         for ( size_t i = 0; i < m_node_data->get_count(); ++i )
         {
-                skeleton[i] = m_node_data->get_node(i)->data->get_transform( frame_num );
+                raw_channel_interpolator interpolator( m_node_data->get_node( i )->data, m_interpolation_key );
+                skeleton[i] = interpolator.get< transform >( frame_num );
         }
 }
@@ -112 +125 @@
         m_bone_ids  = new sint16[ node_count ];
 
+        NV_ASSERT( m_node_data, "node data empty!" );
+
         if ( !m_node_data->is_flat() )
         {
@@ -146 +161 @@
                         if ( node->data )
                         {
-                                node_mat = node->data->get_matrix( anim_time );
+                                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+                                node_mat = interpolator.get< mat4 >( anim_time );
                         }
 
@@ -177 +193 @@
                 }
                 m_bone_ids[n] = bone_id;
+
+                if ( m_interpolation_key.size() == 0 && node->data )
+                        m_interpolation_key = node->data->get_interpolation_key();
+
         }
         m_prepared = true;
@@ -190 +210 @@
         if ( node->data )
         {
-                node_mat = node->data->get_matrix( time );
+                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+                node_mat = interpolator.get< mat4 >( time );
         }