Changeset 480 for trunk/src/formats/nmd_loader.cc

Timestamp:

11/03/15 19:06:23 (10 years ago)

Author:

epyon

Message:

• cleanup of legacy code
• resource updates

File:

• trunk/src/formats/nmd_loader.cc (modified) (3 diffs)

trunk/src/formats/nmd_loader.cc

@@ -50 +50 @@
 }
 
-mesh_data_pack* nv::nmd_loader::release_mesh_data_pack()
-{
-        uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 0 );
-        for ( uint32 i = 0; i < size; ++i )
-        {
-                meshes[i] = move( *m_meshes[i] );
-                delete m_meshes[i];
-        }
-        m_meshes.clear();
-        return new mesh_data_pack( size, meshes, release_mesh_nodes_data() );
-}
-
 void nv::nmd_loader::reset()
 {
@@ -240 +227 @@
 }
 
-void nv::nmd_dump( stream& stream_out, const mesh_data_pack* model, const string_table* strings, uint64 name )
+void nv::nmd_dump( stream& stream_out, array_view< data_channel_set* > meshes, const mesh_nodes_data* nodes, const string_table* strings /*= nullptr*/, uint64 name /*= 0 */ )
 {
         uint32 elements = ( strings ? 1 : 0 ) // +1 string array
-                + model->get_count() // meshes
-                + ( model->get_node_count() > 0 ? 1 : 0 ); // nodes
+                + meshes.size() // meshes
+                + ( nodes && nodes->size() > 0 ? 1 : 0 ); // nodes
         nmd_dump_header( stream_out, elements, name );
 
-        for ( uint32 i = 0; i < model->get_count(); ++i )
-        {
-                nmd_dump_element( stream_out, *model->get_mesh( i ), nv::nmd_type::MESH );
-        }
-
-        if ( model->get_node_count() > 0 )
-        {
-                nmd_dump_nodes( stream_out, *model->get_nodes() );
+        for ( uint32 i = 0; i < meshes.size(); ++i )
+        {
+                NV_ASSERT( meshes[i], "mesh is null!" );
+                nmd_dump_element( stream_out, *meshes[i], nv::nmd_type::MESH );
+        }
+
+        if ( nodes && nodes->size() > 0 )
+        {
+                nmd_dump_nodes( stream_out, *nodes );
         }
 
@@ -262 +250 @@
         }
 }
+
+void nv::nmd_dump( stream& stream_out, const mesh_nodes_data& animation, const string_table* strings, uint64 name )
+{
+        uint32 elements = ( strings ? 1 : 0 ) // +1 string array
+                + ( animation.size() > 0 ? 1 : 0 ); // nodes
+        nmd_dump_header( stream_out, elements, name );
+
+        if ( animation.size() > 0 )
+        {
+                nmd_dump_nodes( stream_out, animation );
+        }
+
+        if ( strings )
+        {
+                nmd_dump_strings( stream_out, *strings );
+        }
+}