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

Timestamp:

07/09/15 12:19:30 (10 years ago)

Author:

epyon

Message:

• mesh_raw_channel and key_raw_channel merged into raw_data_channel

File:

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

trunk/src/formats/nmd_loader.cc

@@ -43 +43 @@
                 nmd_stream_header stream_header;
                 source.read( &stream_header, sizeof( stream_header ), 1 );
-                mesh_raw_channel* channel = mesh_raw_channel::create( stream_header.format, stream_header.count );
+                raw_data_channel* channel = raw_data_channel::create( stream_header.format, stream_header.count );
                 source.read( channel->data, stream_header.format.element_size(), stream_header.count );
                 mesh->add_channel( channel );
@@ -128 +128 @@
                                 nv::nmd_stream_header cheader;
                                 source.read( &cheader, sizeof( cheader ), 1 );
-                                key_raw_channel* channel = key_raw_channel::create( cheader.format, cheader.count );
+                                raw_data_channel* channel = raw_data_channel::create( cheader.format, cheader.count );
                                 source.read( channel->data, channel->desc.element_size(), channel->count );
                                 kdata->add_channel( channel );
@@ -162 +162 @@
 static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out )
 {
-        array_view< mesh_raw_channel* > data  = mesh->get_raw_channels();
+        array_view< raw_data_channel* > data  = mesh->get_raw_channels();
 
         uint32 size = sizeof( nmd_element_header );
@@ -248 +248 @@
                 for ( uint32 c = 0; c < chan_count; ++c )
                 {
-                        const key_raw_channel* channel = node->data->get_channel(c);
+                        const raw_data_channel* channel = node->data->get_channel(c);
 
                         eheader.type     = nmd_type::KEY_CHANNEL;