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

Timestamp:

07/10/15 19:50:47 (10 years ago)

Author:

epyon

Message:

• further access restrictions improvements

File:

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

trunk/src/formats/nmd_loader.cc

@@ -35 +35 @@
 bool nv::nmd_loader::load_mesh( stream& source, const nmd_element_header& e )
 {
-        data_channel_set_creator mesh;
+        data_channel_set* mesh = data_channel_set_creator::create( e.children );
+        data_channel_set_creator mcreator( mesh );
         for ( uint32 s = 0; s < e.children; ++s )
         {
@@ -44 +45 @@
                 nmd_stream_header stream_header;
                 source.read( &stream_header, sizeof( stream_header ), 1 );
-                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() );
+                raw_data_channel_access channel( mcreator.add_channel( stream_header.format, stream_header.count ) );
+                source.read( channel.raw_data(), channel.element_size(), channel.size() );
         }
         m_mesh_names.push_back( e.name );
-        m_meshes.push_back( mesh.release() );
+        m_meshes.push_back( mesh );
         return true;
 }
@@ -121 +121 @@
                 if ( ch_count > 0 )
                 {
-                        key_data* kdata = new key_data;
+                        key_channel_set* kdata = key_channel_set_creator::create( ch_count );
+                        key_channel_set_creator kaccess( kdata );
                         m_node_array[i].data = kdata;
                         for ( uint32 c = 0; c < ch_count; ++c )
@@ -129 +130 @@
                                 nv::nmd_stream_header cheader;
                                 source.read( &cheader, sizeof( cheader ), 1 );
-                                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_key_channel( channel_creator.release() );
+                                raw_data_channel_access channel( kaccess.add_channel( cheader.format, cheader.count ) );
+                                source.read( channel.raw_data(), channel.element_size(), channel.size() );
                         }
                 }