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

Timestamp:

07/09/15 14:40:36 (10 years ago)

Author:

epyon

Message:

• refactoring of raw_data_channel and data_descriptor access

File:

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

trunk/src/formats/nmd_loader.cc

@@ -129 +129 @@
                                 source.read( &cheader, sizeof( cheader ), 1 );
                                 raw_data_channel* channel = raw_data_channel::create( cheader.format, cheader.count );
-                                source.read( channel->data, channel->desc.element_size(), channel->count );
+                                source.read( channel->data, channel->element_size(), channel->element_count() );
                                 kdata->add_channel( channel );
                         }
@@ -168 +168 @@
         {
                 size += sizeof( nmd_element_header ) + sizeof( nmd_stream_header );
-                size += chan->size();
+                size += chan->raw_size();
         }
 
@@ -184 +184 @@
                 cheader.type     = nmd_type::STREAM;
                 cheader.children = 0;
-                cheader.size     = chan->size() + sizeof( nmd_stream_header );
+                cheader.size     = chan->raw_size() + sizeof( nmd_stream_header );
                 stream_out.write( &cheader, sizeof( cheader ), 1 );
 
                 nmd_stream_header sheader;
-                sheader.format = chan->desc;
-                sheader.count  = chan->count;
+                sheader.format = chan->descriptor();
+                sheader.count  = chan->element_count();
                 stream_out.write( &sheader, sizeof( sheader ), 1 );
-                stream_out.write( chan->data, chan->desc.element_size(), chan->count );
+                stream_out.write( chan->raw_data(), chan->element_size(), chan->element_count() );
         }
 }
@@ -206 +206 @@
                         {
                                 total += sizeof( nmd_element_header ) + sizeof( nmd_stream_header );
-                                total += node->data->get_channel(c)->size();
+                                total += node->data->get_channel(c)->raw_size();
                         }
         }
@@ -231 +231 @@
                 {
                         chan_size += sizeof( nmd_element_header ) + sizeof( nv::nmd_stream_header );
-                        chan_size += node->data->get_channel(c)->size();
+                        chan_size += node->data->get_channel(c)->raw_size();
                 }
 
@@ -252 +252 @@
                         eheader.type     = nmd_type::KEY_CHANNEL;
                         eheader.children = 0;
-                        eheader.size     = sizeof( nmd_stream_header ) + channel->size();
+                        eheader.size     = sizeof( nmd_stream_header ) + channel->raw_size();
                         stream_out.write( &eheader, sizeof( eheader ), 1 );
 
                         nmd_stream_header cheader;
-                        cheader.format    = channel->desc;
-                        cheader.count     = channel->count;
+                        cheader.format    = channel->descriptor();
+                        cheader.count     = channel->element_count();
                         stream_out.write( &cheader, sizeof( cheader ), 1 );
-                        stream_out.write( channel->data, channel->desc.element_size(), channel->count );
+                        stream_out.write( channel->raw_data(), channel->element_size(), channel->element_count() );
                 }
         }