Changeset 376 for trunk/src/formats

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

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (1 diff)
• md2_loader.cc (modified) (1 diff)
• md3_loader.cc (modified) (5 diffs)
• md5_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (7 diffs)

trunk/src/formats/assimp_loader.cc

@@ -479 +479 @@
 }
 
-size_t nv::assimp_loader::get_nodes_data_count() const
+nv::size_t nv::assimp_loader::get_nodes_data_count() const
 {
         if ( m_scene == nullptr ) return 0;

trunk/src/formats/md2_loader.cc

@@ -167 +167 @@
         
         source.seek( md2->header.offset_skins, origin::SET );
-        source.read( md2->skins, sizeof(md2_skin_t), static_cast<size_t>( md2->header.num_skins ) );
+        source.read( md2->skins, sizeof( md2_skin_t ), static_cast<nv::size_t>( md2->header.num_skins ) );
 
         source.seek( md2->header.offset_st, origin::SET );
-        source.read( md2->texcoords, sizeof(md2_texcoord_t), static_cast<size_t>( md2->header.num_st ) );
+        source.read( md2->texcoords, sizeof( md2_texcoord_t ), static_cast<nv::size_t>( md2->header.num_st ) );
 
         source.seek( md2->header.offset_tris, origin::SET );
-        source.read( md2->triangles, sizeof(md2_triangle_t), static_cast<size_t>( md2->header.num_tris ) );
+        source.read( md2->triangles, sizeof( md2_triangle_t ), static_cast<nv::size_t>( md2->header.num_tris ) );
 
         source.seek( md2->header.offset_glcmds, origin::SET);
-        source.read( md2->glcmds, sizeof(int), static_cast<size_t>( md2->header.num_glcmds ) );
+        source.read( md2->glcmds, sizeof( int ), static_cast<nv::size_t>( md2->header.num_glcmds ) );
 
         md2->frames    = new md2_frame_t   [ md2->header.num_frames ];

trunk/src/formats/md3_loader.cc

@@ -161 +161 @@
 
         source.seek( pos + surface->header.ofs_shaders, origin::SET );
-        source.read( surface->shaders, sizeof( md3_shader_t ), static_cast<size_t>( surface->header.num_shaders ) );
+        source.read( surface->shaders, sizeof( md3_shader_t ), static_cast<nv::size_t>( surface->header.num_shaders ) );
 
         source.seek( pos + surface->header.ofs_triangles, origin::SET );
-        source.read( surface->triangles, sizeof( md3_triangle_t ), static_cast<size_t>( surface->header.num_triangles ) );
+        source.read( surface->triangles, sizeof( md3_triangle_t ), static_cast<nv::size_t>( surface->header.num_triangles ) );
 
         source.seek( pos + surface->header.ofs_st, origin::SET );
-        source.read( surface->st, sizeof( md3_texcoord_t ), static_cast<size_t>( surface->header.num_verts ) );
+        source.read( surface->st, sizeof( md3_texcoord_t ), static_cast<nv::size_t>( surface->header.num_verts ) );
 
         source.seek( pos + surface->header.ofs_xyznormal, origin::SET );
-        source.read( surface->vertices, sizeof( md3_vertex_t ), static_cast<size_t>( surface->header.num_verts * surface->header.num_frames ) );
-
-        if ( source.tell() != static_cast<size_t>( pos + surface->header.ofs_end ) ) return false;
+        source.read( surface->vertices, sizeof( md3_vertex_t ), static_cast<nv::size_t>( surface->header.num_verts * surface->header.num_frames ) );
+
+        if ( source.tell() != static_cast<nv::size_t>( pos + surface->header.ofs_end ) ) return false;
 
         return true;
@@ -198 +198 @@
         md3->tags     = new md3_tag_t    [ md3->header.num_tags * md3->header.num_frames ];
         md3->surfaces = new md3_surface_t[ md3->header.num_surfaces ];
-        std::memset( md3->surfaces, 0, static_cast< size_t >( md3->header.num_surfaces ) * sizeof(md3_surface_t) );
+        std::memset( md3->surfaces, 0, static_cast< nv::size_t >( md3->header.num_surfaces ) * sizeof( md3_surface_t ) );
 
         source.seek( md3->header.ofs_frames, origin::SET );
-        source.read( md3->frames, sizeof( md3_frame_t ), static_cast<size_t>( md3->header.num_frames ) );
+        source.read( md3->frames, sizeof( md3_frame_t ), static_cast<nv::size_t>( md3->header.num_frames ) );
 
         if ( md3->header.num_tags > 0 )
         {
                 source.seek( md3->header.ofs_tags, origin::SET );
-                source.read( md3->tags, sizeof( md3_tag_t ), static_cast<size_t>( md3->header.num_tags * md3->header.num_frames ) );
+                source.read( md3->tags, sizeof( md3_tag_t ), static_cast<nv::size_t>( md3->header.num_tags * md3->header.num_frames ) );
         }
 
@@ -321 +321 @@
 };
 
-mesh_data* nv::md3_loader::release_mesh_data( size_t index )
+mesh_data* nv::md3_loader::release_mesh_data( nv::size_t index )
 {
         mesh_data* data = new mesh_data;
@@ -417 +417 @@
 }
 
-mesh_nodes_data* nv::md3_loader::release_mesh_nodes_data( size_t )
+mesh_nodes_data* nv::md3_loader::release_mesh_nodes_data( nv::size_t )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -464 +464 @@
 }
 
-size_t md3_loader::get_max_frames() const
+nv::size_t md3_loader::get_max_frames() const
 {
         return static_cast< size_t >( ((md3_t*)m_md3)->header.num_frames );

trunk/src/formats/md5_loader.cc

@@ -24 +24 @@
 static void remove_quotes( std::string& str )
 {
-        size_t n;
+        nv::size_t n;
         while ( ( n = str.find('\"') ) != std::string::npos ) str.erase(n,1);
 }

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;