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

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

File:

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

trunk/src/formats/obj_loader.cc

@@ -53 +53 @@
         std::string next_name;
 
-        size_t size;
+        nv::size_t size;
         bool   eof;
 
         obj_reader();
         bool read_stream( std::istream& stream );
-        virtual size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count ) = 0;
-        virtual size_t raw_size() const = 0;
+        virtual nv::size_t add_face( uint32* vi, uint32* ti, uint32* ni, nv::size_t count ) = 0;
+        virtual nv::size_t raw_size() const = 0;
         virtual void reset() = 0;
         virtual const uint8* raw_pointer() const = 0;
@@ -172 +172 @@
 {
         mesh_data_reader( bool normals ) : m_normals( normals ) {}
-        virtual size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
+        virtual nv::size_t add_face( uint32* vi, uint32* ti, uint32* ni, nv::size_t count )
         {
                 if ( count < 3 ) return 0; // TODO : report error?
@@ -178 +178 @@
                 // TODO : support if normals not present;
                 vec3 nullvec;
-                size_t result = 0;
+                nv::size_t result = 0;
                 // Simple triangulation - obj's shouldn't have more than quads anyway
 
                 if ( m_normals )
                 {
-                        for ( size_t i = 2; i < count; ++i )
+                        for ( nv::size_t i = 2; i < count; ++i )
                         {
                                 result++;
@@ -193 +193 @@
                 else
                 {
-                        for ( size_t i = 2; i < count; ++i )
+                        for ( nv::size_t i = 2; i < count; ++i )
                         {
                                 result++;
@@ -206 +206 @@
         std::vector< VTX > m_data;
         virtual void reset() { m_data.clear(); }
-        virtual size_t raw_size() const { return m_data.size() * sizeof( VTX ); }
+        virtual nv::size_t raw_size() const { return m_data.size() * sizeof( VTX ); }
         virtual const uint8* raw_pointer() const { return (const uint8*)m_data.data(); }
 };
@@ -233 +233 @@
                 //              std::vector< vec3 >& tg = m_mesh->get_tangents();
 
-                size_t count  = m_data.size();
-                size_t tcount = count / 3;
+                nv::size_t count = m_data.size();
+                nv::size_t tcount = count / 3;
 
                 std::vector< vec3 > tan1( count );
                 std::vector< vec3 > tan2( count );
 
-                for (size_t a = 0; a < tcount; ++a )
-                {
-                        size_t i1 = a * 3;
-                        size_t i2 = a * 3 + 1;
-                        size_t i3 = a * 3 + 2;
+                for ( nv::size_t a = 0; a < tcount; ++a )
+                {
+                        nv::size_t i1 = a * 3;
+                        nv::size_t i2 = a * 3 + 1;
+                        nv::size_t i3 = a * 3 + 2;
                         obj_vertex_vtnt& vtx1 = m_data[ i1 ];
                         obj_vertex_vtnt& vtx2 = m_data[ i2 ];
@@ -278 +278 @@
                 }
 
-                for (size_t a = 0; a < count; ++a )
+                for ( nv::size_t a = 0; a < count; ++a )
                 {
                         const vec3& n = m_data[a].normal;