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

Timestamp:

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

Author:

epyon

Message:

• cleanup of mesh_node_data

File:

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

trunk/src/gfx/mesh_creator.cc

@@ -18 +18 @@
         for ( size_t i = 0; i < m_data->get_count(); ++i )
         {
-                sint16 parent_id = m_data->m_nodes[i].data->get_parent_id();
-                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 );
+                data_channel_set* keys = m_data->m_data[i];
+                sint16 parent_id = keys->get_parent_id();
+                data_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_data[parent_id] : nullptr );
                 size_t count     = ( keys ? keys->get_channel_size(0) : 0 );
                 size_t pcount    = ( pkeys ? pkeys->get_channel_size(0) : 0 );
@@ -51 +51 @@
         for ( size_t i = 0; i < m_data->get_count(); ++i )
         {
-                data_channel_set* old_keys = m_data->m_nodes[i].data;
+                data_channel_set* old_keys = m_data->m_data[i];
                 if ( old_keys && old_keys->size() > 0 )
                 {
@@ -89 +89 @@
 
                         delete old_keys;
-                        m_data->m_nodes[i].data = new_keys;
+                        m_data->m_data[i] = new_keys;
                 }
         }
@@ -102 +102 @@
         for ( size_t i = 0; i < m_data->get_count(); ++i )
         {
-                mesh_node_data& node = m_data->m_nodes[i];
-                node.data->m_transform = pre_transform * node.data->m_transform * post_transform;
-                if ( node.data )
-                {
-                        data_channel_set* kdata  = node.data;
-                        for ( size_t c = 0; c < kdata->size(); ++c )
-                        {
-                                raw_data_channel_access channel( kdata, c );
-                                size_t key_size = channel.element_size();
-                                for ( size_t n = 0; n < channel.size(); ++n )
-                                {
-                                        transform_key_raw( kdata->get_channel( c )->descriptor(), channel.raw_data() + n * key_size, scale, r33, ri33 );
-                                }
+                data_channel_set* node = m_data->m_data[i];
+                node->m_transform = pre_transform * node->m_transform * post_transform;
+
+                for ( size_t c = 0; c < node->size(); ++c )
+                {
+                        raw_data_channel_access channel( node, c );
+                        size_t key_size = channel.element_size();
+                        for ( size_t n = 0; n < channel.size(); ++n )
+                        {
+                                transform_key_raw( node->get_channel( c )->descriptor(), channel.raw_data() + n * key_size, scale, r33, ri33 );
                         }
                 }
@@ -458 +455 @@
         if ( index < m_pack->get_count() )
         {
-                data_channel_set_creator( &m_pack->m_meshes[m_pack->m_count - 1] ).move_to( m_pack->m_meshes[index] );
+
+                m_pack->m_meshes[index] = move( m_pack->m_meshes[m_pack->m_count - 1] );
                 m_pack->m_count--;
         }