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

Timestamp:

06/11/15 16:23:41 (10 years ago)

Author:

epyon

Message:

• massive shift towards nova STL
• include cleanups

File:

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

trunk/src/formats/assimp_loader.cc

@@ -6 +6 @@
 
 #include "nv/formats/assimp_loader.hh"
-#include <unordered_map>
-#include "nv/io/std_stream.hh"
+#include "nv/stl/unordered_map.hh"
 #include "nv/gfx/mesh_creator.hh"
 #include "nv/lib/assimp.hh"
@@ -286 +285 @@
         const aiScene* scene = (const aiScene*)m_scene;
         vector< mesh_node_data > final_bones;
-        std::unordered_map< std::string, uint16 > names;
+        unordered_map< std::string, uint16 > names;
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {
@@ -334 +333 @@
         }
         mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
-        nv::raw_copy( final_bones.begin(), final_bones.end(), bones );
+        raw_copy( final_bones.begin(), final_bones.end(), bones );
         return new mesh_nodes_data( "bones", final_bones.size(), bones );
 }