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

Timestamp:

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

Author:

epyon

Message:

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

File:

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

trunk/src/formats/nmd_loader.cc

@@ -37 +37 @@
 bool nv::nmd_loader::load_mesh( stream& source, const nmd_element_header& e )
 {
-        data_channel_set* mesh = data_channel_set_creator::create( e.children );
+        data_channel_set* mesh = data_channel_set_creator::create_set( e.children );
         load_channel_set( source, mesh, e );
 //      m_mesh_names.push_back( e.name );
@@ -55 +55 @@
 {
         uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_array( size, 0 );
+        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 0 );
         for ( uint32 i = 0; i < size; ++i )
         {
@@ -119 +119 @@
 bool nv::nmd_loader::load_node( stream& source, mesh_node_data* data, const nmd_element_header& e )
 {
-        data->name = e.name;
-        data->parent_id = e.parent_id;
-        data->transform = e.transform;
-        data->data = nullptr;
+        data->data = data_channel_set_creator::create_set( e.children );
         if ( e.children > 0 )
         {
-                data->data = data_channel_set_creator::create( e.children );
                 load_channel_set( source, data->data, e );
         }
+        data_channel_set_creator access( data->data );
+        access.set_name( e.name );
+        access.set_parent_id( e.parent_id );
+        access.set_transform( e.transform );
         return true;
 }
@@ -206 +206 @@
         eheader.children   = static_cast<uint16>( chan_count );
         eheader.size       = chan_size;
-        eheader.name       = node->name;
-        eheader.parent_id  = node->parent_id;
-        eheader.transform  = node->transform;
+        eheader.name       = node->data->get_name();
+        eheader.parent_id  = node->data->get_parent_id();
+        eheader.transform  = node->data->get_transform();
         eheader.attributes = 0;
         stream_out.write( &eheader, sizeof( eheader ), 1 );
-        if ( node->data ) nmd_dump_channel_set( node->data, stream_out );
+        if ( chan_count > 0 ) nmd_dump_channel_set( node->data, stream_out );
 }
 
@@ -238 +238 @@
         eheader.children   = static_cast<uint16>( mesh.size() );
         eheader.size       = size;
-        int uncomment;
-//      eheader.name       = mesh.get_name();
-//      eheader.transform  = mesh.get_transform();
-//      eheader.parent_id  = mesh.get_parent_id();
-        eheader.name       = 0;
-        eheader.transform  = mat4();
-        eheader.parent_id  = -1;
+        eheader.name       = mesh.get_name();
+        eheader.transform  = mesh.get_transform();
+        eheader.parent_id  = mesh.get_parent_id();
         eheader.attributes = 0;
         stream_out.write( &eheader, sizeof( eheader ), 1 );