Changeset 412 for trunk/src/formats/obj_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/obj_loader.cc (modified) (1 diff)

trunk/src/formats/obj_loader.cc

@@ -324 +324 @@
                 }
         
-                raw_data_channel* channel = new raw_data_channel();
-                nv::uint8* data = nullptr;
-
-                if ( reader->raw_size() > 0 ) 
-                {
-                        data = new uint8[ reader->raw_size() ];
-                        raw_copy_n( reader->raw_pointer(), reader->raw_size(), data );
-                }
-                channel->data  = data;
-                channel->desc  = m_descriptor;
-                channel->count = reader->size * 3;
+                raw_data_channel* channel = raw_data_channel::create( m_descriptor, reader->size * 3 );
+                if ( reader->raw_size() > 0 )
+                {
+                        raw_copy_n( reader->raw_pointer(), reader->raw_size(), channel->data );
+                }
 
                 mesh_data* mesh = new mesh_data(reader->name);