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

Timestamp:

07/16/15 21:21:19 (10 years ago)

Author:

epyon

Message:

• refactoring WIP! (compiles though - warnings on purpose)

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)->transform );
+                m_bone_offset[i] = transform( bones->get_node(i)->data->get_transform() );
         }
 
@@ -95 +95 @@
         for ( size_t i = 0; i < m_node_data->get_count(); ++i )
         {
-                if ( m_node_data->get_node( i )->data )
+                if ( m_node_data->is_animated( i ) )
                 {
                         m_interpolation_key = m_node_data->get_node( i )->data->get_interpolation_key();
@@ -133 +133 @@
                 {
                         const mesh_node_data* node = m_node_data->get_node(n);
-                        if ( node->parent_id != -1 )
-                        {
-                                m_children[ node->parent_id ].push_back( n );
+                        if ( node->data->get_parent_id() != -1 )
+                        {
+                                m_children[ node->data->get_parent_id()].push_back( n );
                         }
                 }
@@ -157 +157 @@
                 {
                         const mesh_node_data* node = m_node_data->get_node(n);
-                        nv::mat4 node_mat( node->transform );
-
-                        if ( node->data )
+                        nv::mat4 node_mat( node->data->get_transform() );
+
+                        if ( node->data && node->data->size() > 0 )
                         {
                                 raw_channel_interpolator interpolator( node->data, m_interpolation_key );
@@ -178 +178 @@
         {
                 const mesh_node_data* bone = bones->get_node(bi);
-                bone_names[ bone->name ] = bi;
-                m_offsets[bi] = bone->transform;
+                bone_names[ bone->data->get_name() ] = bi;
+                m_offsets[bi] = bone->data->get_transform();
         }
 
@@ -187 +187 @@
                 sint16 bone_id = -1;
 
-                auto bi = bone_names.find( node->name );
+                auto bi = bone_names.find( node->data->get_name() );
                 if ( bi != bone_names.end() )
                 {
@@ -194 +194 @@
                 m_bone_ids[n] = bone_id;
 
-                if ( m_interpolation_key.size() == 0 && node->data )
+                if ( m_interpolation_key.size() == 0 && node->data->size() > 0 )
                         m_interpolation_key = node->data->get_interpolation_key();
 
@@ -206 +206 @@
         //       see note in assimp_loader.cc:load_node
         const mesh_node_data* node = m_node_data->get_node( node_id );
-        mat4 node_mat( node->transform );
-
-        if ( node->data )
+        mat4 node_mat( node->data->get_transform() );
+
+        if ( node->data && node->data->size() > 0 )
         {
                 raw_channel_interpolator interpolator( node->data, m_interpolation_key );