Changeset 383 for trunk/src/formats/obj_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/obj_loader.cc (modified) (4 diffs)

trunk/src/formats/obj_loader.cc

@@ -44 +44 @@
 struct obj_reader
 {
-        std::vector< vec3 > v;
-        std::vector< vec3 > n;
-        std::vector< vec2 > t;
+        vector< vec3 > v;
+        vector< vec3 > n;
+        vector< vec2 > t;
 
         std::string line;
@@ -204 +204 @@
         }
         bool m_normals;
-        std::vector< VTX > m_data;
+        vector< VTX > m_data;
         virtual void reset() { m_data.clear(); }
         virtual nv::size_t raw_size() const { return m_data.size() * sizeof( VTX ); }
@@ -228 +228 @@
         void calculate_tangents()
         {
-                //              const std::vector< vec3 >& vp = m_mesh->get_positions();
-                //              const std::vector< vec2 >& vt = m_mesh->get_texcoords();
-                //              const std::vector< vec3 >& vn = m_mesh->get_normals();
-                //              std::vector< vec3 >& tg = m_mesh->get_tangents();
-
                 nv::size_t count = m_data.size();
                 nv::size_t tcount = count / 3;
 
-                std::vector< vec3 > tan1( count );
-                std::vector< vec3 > tan2( count );
+                vector< vec3 > tan1( count );
+                vector< vec3 > tan2( count );
 
                 for ( nv::size_t a = 0; a < tcount; ++a )
@@ -335 +330 @@
                 {
                         data = new uint8[ reader->raw_size() ];
-                        std::copy_n( reader->raw_pointer(), reader->raw_size(), data );
+                        raw_copy_n( reader->raw_pointer(), reader->raw_size(), data );
                 }
                 channel->data  = data;