Changeset 482 for trunk/src/formats/obj_loader.cc

Timestamp:

11/12/15 19:02:08 (10 years ago)

Author:

epyon

Message:

• skeletal animation updated

File:

• trunk/src/formats/obj_loader.cc (modified) (3 diffs)

trunk/src/formats/obj_loader.cc

@@ -327 +327 @@
         
                 data_channel_set* result = data_channel_set_creator::create_set( 1 );
-                data_channel_set_creator raccess( result );
-                raccess.set_name( make_name( reader->name ) );
-                uint8* rdata = raccess.add_channel( m_descriptor, reader->size * 3 ).raw_data();
+
+                uint8* rdata = data_channel_set_creator(result).add_channel( m_descriptor, reader->size * 3 ).raw_data();
 
                 if ( reader->raw_size() > 0 )
@@ -335 +334 @@
                         raw_copy_n( reader->raw_pointer(), reader->raw_size(), rdata );
                 }
-
+                data_node_info info;
+                info.name = make_name( reader->name );
+                info.parent_id = -1;
+                m_infos.push_back( info );
                 m_meshes.push_back( result );
 
@@ -345 +347 @@
 }
 
-data_channel_set* nv::obj_loader::release_mesh_data( size_t index )
+data_channel_set* nv::obj_loader::release_mesh_data( size_t index, data_node_info& info )
 {
         data_channel_set* result = m_meshes[ index ];
+        info = m_infos[index];
         m_meshes[ index ] = nullptr;
         return result;