Changeset 383 for trunk/src/formats/assimp_loader.cc

Timestamp:

06/02/15 20:56:15 (10 years ago)

Author:

epyon

Message:

• more work on stl
• fully working vectors!
• copy & copy_n
• removal of a lot of std code!

File:

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

trunk/src/formats/assimp_loader.cc

@@ -188 +188 @@
 }
 
-bool nv::assimp_loader::load_bones( size_t index, std::vector< mesh_node_data >& bones )
+bool nv::assimp_loader::load_bones( size_t index, array_ref< mesh_node_data > bones )
 {
         if ( m_scene == nullptr ) return false;
@@ -285 +285 @@
 {
         const aiScene* scene = (const aiScene*)m_scene;
-        std::vector< mesh_node_data > final_bones;
+        vector< mesh_node_data > final_bones;
         std::unordered_map< std::string, uint16 > names;
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {
                 uint16 translate[MAX_BONES];
-                std::vector< mesh_node_data > bones;
+                vector< mesh_node_data > bones;
                 const aiMesh*  mesh  = scene->mMeshes[ m ];
                 if ( mesh->mNumBones != 0 )
@@ -334 +334 @@
         }
         mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
-        std::copy( final_bones.begin(), final_bones.end(), bones );
+        nv::raw_copy( final_bones.begin(), final_bones.end(), bones );
         return new mesh_nodes_data( "bones", final_bones.size(), bones );
 }