Changeset 475 for trunk/src/formats

Timestamp:

10/09/15 14:08:44 (10 years ago)

Author:

epyon

Message:

• skeletal_mesh updates

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (3 diffs)
• md3_loader.cc (modified) (1 diff)
• nmd_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -307 +307 @@
                                         NV_ASSERT( result->size() < MAX_BONES, "Too many bones to merge!" );
                                         uint16 index = uint16( result->size() );
-                                        result->push_back( bone );
+                                        result->append( bone );
                                         names[ bone->get_name() ] = index;
                                         translate[b] = index;
@@ -334 +334 @@
                 }       
         }
+        result->initialize();
 
         return result;
@@ -360 +361 @@
         for ( auto set : temp_ref )
         {
-                result->push_back( set );
-        }
+                result->append( set );
+        }
+        result->initialize();
         delete temp;
         return result;

trunk/src/formats/md3_loader.cc

@@ -429 +429 @@
                 access.set_name( make_name( name ) );
                 load_tags( access.add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
-                result->push_back( set );
-        }
+                result->append( set );
+        }
+        result->initialize();
         return result;
 }

trunk/src/formats/nmd_loader.cc

@@ -107 +107 @@
                 data_channel_set* set = data_channel_set_creator::create_set( element_header.children );
                 load_channel_set( source, set, element_header );
-                m_node_data->push_back( set );
-        }
+                m_node_data->append( set );
+        }
+        m_node_data->initialize();
         return true;
 }