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

Timestamp:

07/20/15 13:25:20 (10 years ago)

Author:

epyon

Message:

• cleanup of mesh_node_data

File:

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

trunk/src/gfx/skeletal_mesh.cc

@@ -23 +23 @@
         for ( uint32 i = 0; i < bones->get_count(); ++i )
         {
-                m_bone_offset[i] = transform( bones->get_node(i)->data->get_transform() );
+                m_bone_offset[i] = transform( (*bones)[i]->get_transform() );
         }
 
@@ -93 +93 @@
 void nv::skeletal_animation_entry_cpu::initialize()
 {
-        for ( size_t i = 0; i < m_node_data->get_count(); ++i )
-        {
-                if ( m_node_data->is_animated( i ) )
-                {
-                        m_interpolation_key = m_node_data->get_node( i )->data->get_interpolation_key();
+        for ( auto bone : *m_node_data )
+        {
+                if ( bone->size() > 0 )
+                {
+                        m_interpolation_key = bone->get_interpolation_key();
                         break;
                 }
@@ -112 +112 @@
         for ( size_t i = 0; i < m_node_data->get_count(); ++i )
         {
-                raw_channel_interpolator interpolator( m_node_data->get_node( i )->data, m_interpolation_key );
+                raw_channel_interpolator interpolator( (*m_node_data)[i], m_interpolation_key );
                 skeleton[i] = interpolator.get< transform >( frame_num );
         }
@@ -132 +132 @@
                 for ( uint32 n = 0; n < node_count; ++n )
                 {
-                        const mesh_node_data* node = m_node_data->get_node(n);
-                        if ( node->data->get_parent_id() != -1 )
-                        {
-                                m_children[ node->data->get_parent_id()].push_back( n );
+                        const data_channel_set* node = (*m_node_data)[n];
+                        if ( node->get_parent_id() != -1 )
+                        {
+                                m_children[ node->get_parent_id()].push_back( n );
                         }
                 }
@@ -156 +156 @@
                 if ( m_bone_ids[n] >= 0 )
                 {
-                        const mesh_node_data* node = m_node_data->get_node(n);
-                        nv::mat4 node_mat( node->data->get_transform() );
-
-                        if ( node->data && node->data->size() > 0 )
-                        {
-                                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+                        const data_channel_set* node = m_node_data->get_node(n);
+                        nv::mat4 node_mat( node->get_transform() );
+
+                        if ( node->size() > 0 )
+                        {
+                                raw_channel_interpolator interpolator( node, m_interpolation_key );
                                 node_mat = interpolator.get< mat4 >( anim_time );
                         }
@@ -177 +177 @@
         for ( nv::uint16 bi = 0; bi < bones->get_count(); ++bi )
         {
-                const mesh_node_data* bone = bones->get_node(bi);
-                bone_names[ bone->data->get_name() ] = bi;
-                m_offsets[bi] = bone->data->get_transform();
+                const data_channel_set* bone = bones->get_node( bi );
+                bone_names[ bone->get_name() ] = bi;
+                m_offsets[bi] = bone->get_transform();
         }
 
         for ( uint32 n = 0; n < m_node_data->get_count(); ++n )
         {
-                const mesh_node_data* node = m_node_data->get_node(n);
+                const data_channel_set* node = m_node_data->get_node( n );
                 sint16 bone_id = -1;
 
-                auto bi = bone_names.find( node->data->get_name() );
+                auto bi = bone_names.find( node->get_name() );
                 if ( bi != bone_names.end() )
                 {
@@ -194 +194 @@
                 m_bone_ids[n] = bone_id;
 
-                if ( m_interpolation_key.size() == 0 && node->data->size() > 0 )
-                        m_interpolation_key = node->data->get_interpolation_key();
+                if ( m_interpolation_key.size() == 0 && node->size() > 0 )
+                        m_interpolation_key = node->get_interpolation_key();
 
         }
@@ -205 +205 @@
         // TODO: fix transforms, which are now embedded,
         //       see note in assimp_loader.cc:load_node
-        const mesh_node_data* node = m_node_data->get_node( node_id );
-        mat4 node_mat( node->data->get_transform() );
-
-        if ( node->data && node->data->size() > 0 )
-        {
-                raw_channel_interpolator interpolator( node->data, m_interpolation_key );
+        const data_channel_set* node = m_node_data->get_node( node_id );
+        mat4 node_mat( node->get_transform() );
+
+        if ( node->size() > 0 )
+        {
+                raw_channel_interpolator interpolator( node, m_interpolation_key );
                 node_mat = interpolator.get< mat4 >( time );
         }