Changeset 427 for trunk/src/formats/md3_loader.cc

Timestamp:

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

Author:

epyon

Message:

• cleanup of mesh_node_data

File:

• trunk/src/formats/md3_loader.cc (modified) (1 diff)

trunk/src/formats/md3_loader.cc

@@ -420 +420 @@
         uint32 node_count = uint32( md3->header.num_tags );
         if ( node_count == 0 ) return nullptr;
-        mesh_node_data* nodes = new mesh_node_data[ node_count ];
+        mesh_nodes_data* result = new mesh_nodes_data( m_strings ? m_strings->insert( "tags" ) : 0 );
         for ( uint32 i = 0; i < node_count; ++i )
         {
                 const md3_tag_t& rtag = md3->tags[i];
                 string_view name( reinterpret_cast< const char* >(rtag.name) );
-                nodes[i].data      = data_channel_set_creator::create_set( 1 );
-                data_channel_set_creator access( nodes[i].data );
+                data_channel_set* set = data_channel_set_creator::create_set( 1 );
+                data_channel_set_creator access( set );
                 access.set_name( make_name( name ) );
                 load_tags( access.add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
-        }
-        return new mesh_nodes_data( m_strings ? m_strings->insert( "tags" ) : 0, node_count, nodes );
+                result->push_back( set );
+        }
+        return result;
 }