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

Timestamp:

07/10/15 14:16:42 (10 years ago)

Author:

epyon

Message:

• mesh_data and key_data are data_channel_set (WIP)
• massive cleanup of privacy in data_channels

File:

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

trunk/src/formats/nmd_loader.cc

@@ -8 +8 @@
 #include "nv/io/std_stream.hh"
 #include "nv/stl/string.hh"
+#include "nv/interface/data_channel_access.hh"
 
 using namespace nv;
@@ -34 +35 @@
 bool nv::nmd_loader::load_mesh( stream& source, const nmd_element_header& e )
 {
-        mesh_data* mesh = new mesh_data();
+        data_channel_set_creator mesh;
         for ( uint32 s = 0; s < e.children; ++s )
         {
@@ -45 +46 @@
                 raw_data_channel_creator channel_creator( stream_header.format, stream_header.count );
                 source.read( channel_creator.raw_data(), channel_creator.element_size(), channel_creator.size() );
-                mesh->add_channel( channel_creator.release() );
+                mesh.add_channel( channel_creator.release() );
         }
         m_mesh_names.push_back( e.name );
-        m_meshes.push_back( mesh );
-        return true;
-}
-
-mesh_data* nv::nmd_loader::release_mesh_data( size_t index )
-{
-        mesh_data* result = m_meshes[ index ];
-        if ( m_strings ) result->set_name( m_strings->get( m_mesh_names[ index ] ) );
+        m_meshes.push_back( mesh.release() );
+        return true;
+}
+
+data_channel_set* nv::nmd_loader::release_mesh_data( size_t index )
+{
+        data_channel_set* result = m_meshes[ index ];
+        if ( m_strings ) data_channel_set_creator( result ).set_name( m_strings->get( m_mesh_names[ index ] ) );
         m_meshes[ index ] = nullptr;
         return result;
@@ -63 +64 @@
 {
         uint32 size = m_meshes.size();
-        mesh_data* meshes = new mesh_data[ size ];
+        data_channel_set* meshes = data_channel_set_creator::create_array( size, 0 );
         for ( uint32 i = 0; i < size; ++i )
         {
-                m_meshes[i]->move_to( meshes[i] );
+                data_channel_set_creator( m_meshes[i] ).move_to( meshes[i] );
                 delete m_meshes[i];
         }
@@ -130 +131 @@
                                 raw_data_channel_creator channel_creator( cheader.format, cheader.count );
                                 source.read( channel_creator.raw_data(), channel_creator.element_size(), channel_creator.size() );
-                                kdata->add_channel( channel_creator.release() );
+                                kdata->add_key_channel( channel_creator.release() );
                         }
                 }
@@ -160 +161 @@
 // nmd format dump
 // HACK : TEMPORARY - will go to it's own file, probably nmd_io
-static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out )
-{
-        array_view< raw_data_channel* > data  = mesh->get_raw_channels();
-
+static void nmd_dump_mesh( const data_channel_set* mesh, stream& stream_out )
+{
         uint32 size = sizeof( nmd_element_header );
-        for ( auto chan : data )
+        for ( auto chan : *mesh )
         {
                 size += sizeof( nmd_element_header ) + sizeof( nmd_stream_header );
@@ -174 +173 @@
         eheader.type     = nmd_type::MESH;
         eheader.name     = 0;
-        eheader.children = static_cast< uint16 >( data.size() );
+        eheader.children = static_cast< uint16 >( mesh->size() );
         eheader.size     = size;
         stream_out.write( &eheader, sizeof( eheader ), 1 );
 
-        for ( auto chan : data )
+        for ( auto chan : *mesh )
         {
                 nmd_element_header cheader;
@@ -203 +202 @@
                 total += sizeof( nmd_element_header ) + sizeof( nmd_node_header );
                 if ( node->data )
-                        for ( uint32 c = 0; c < node->data->get_channel_count(); ++c )
+                        for ( uint32 c = 0; c < node->data->size(); ++c )
                         {
                                 total += sizeof( nmd_element_header ) + sizeof( nmd_stream_header );
@@ -227 +226 @@
                 const mesh_node_data* node = nodes->get_node(i);
                 uint32 chan_size  = 0;
-                uint32 chan_count = ( node->data ? node->data->get_channel_count() : 0 );
+                uint32 chan_count = ( node->data ? node->data->size() : 0 );
                 for ( uint32 c = 0; c < chan_count; ++c )
                 {
@@ -280 +279 @@
         for ( uint32 i = 0; i < model->get_count(); ++i )
         {
-                const mesh_data* mesh = model->get_mesh(i);
+                const data_channel_set* mesh = model->get_mesh(i);
                 nmd_dump_mesh( mesh, stream_out );
         }