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

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

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

trunk/src/formats/obj_loader.cc

@@ -1 @@
-// Copyright (C) 2012-2015 ChaosForge Ltd
+// Copyright (C) 2012-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -52 +52 @@
         string32 next_name;
 
-        nv::size_t size;
+        uint32 size;
         bool   eof;
 
         obj_reader();
         bool read_stream( stream& str );
-        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 uint32 add_face( uint32* vi, uint32* ti, uint32* ni, uint32 count ) = 0;
+        virtual uint32 raw_size() const = 0;
         virtual void reset() = 0;
         virtual const uint8* raw_pointer() const = 0;
@@ -126 +126 @@
                         string_view scan( cline );
                         scan.remove_prefix( 2 );
-                        size_t pos = 0;
+                        uint32 pos = 0;
                         while ( pos != string_view::npos )
                         {
@@ -176 +176 @@
 {
         mesh_data_reader( bool normals ) : m_normals( normals ) {}
-        virtual nv::size_t add_face( uint32* vi, uint32* ti, uint32* ni, nv::size_t count )
+        virtual uint32 add_face( uint32* vi, uint32* ti, uint32* ni, uint32 count )
         {
                 if ( count < 3 ) return 0; // TODO : report error?
@@ -182 +182 @@
                 // TODO : support if normals not present;
                 vec3 nullvec;
-                nv::size_t result = 0;
+                uint32 result = 0;
                 // Simple triangulation - obj's shouldn't have more than quads anyway
 
                 if ( m_normals )
                 {
-                        for ( nv::size_t i = 2; i < count; ++i )
+                        for ( uint32 i = 2; i < count; ++i )
                         {
                                 result++;
@@ -197 +197 @@
                 else
                 {
-                        for ( nv::size_t i = 2; i < count; ++i )
+                        for ( uint32 i = 2; i < count; ++i )
                         {
                                 result++;
@@ -210 +210 @@
         vector< VTX > m_data;
         virtual void reset() { m_data.clear(); }
-        virtual nv::size_t raw_size() const { return m_data.size() * sizeof( VTX ); }
+        virtual uint32 raw_size() const { return m_data.size() * sizeof( VTX ); }
         virtual const uint8* raw_pointer() const { return reinterpret_cast< const uint8* >( m_data.data() ); }
 };
@@ -232 +232 @@
         void calculate_tangents()
         {
-                nv::size_t count = m_data.size();
-                nv::size_t tcount = count / 3;
+                uint32 count = m_data.size();
+                uint32 tcount = count / 3;
 
                 vector< vec3 > tan1( count );
                 vector< vec3 > tan2( count );
 
-                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;
+                for ( uint32 a = 0; a < tcount; ++a )
+                {
+                        uint32 i1 = a * 3;
+                        uint32 i2 = a * 3 + 1;
+                        uint32 i3 = a * 3 + 2;
                         obj_vertex_vtnt& vtx1 = m_data[ i1 ];
                         obj_vertex_vtnt& vtx2 = m_data[ i2 ];
@@ -277 +277 @@
                 }
 
-                for ( nv::size_t a = 0; a < count; ++a )
+                for ( uint32 a = 0; a < count; ++a )
                 {
                         const vec3& nv = m_data[a].normal;
@@ -347 +347 @@
 }
 
-data_channel_set* nv::obj_loader::release_mesh_data( size_t index, data_node_info& info )
+data_channel_set* nv::obj_loader::release_mesh_data( uint32 index, data_node_info& info )
 {
         data_channel_set* result = m_meshes[ index ];