Changeset 374 for trunk/src/formats

Timestamp:

05/26/15 17:35:06 (10 years ago)

Author:

epyon

Message:

• MASSIVE commit
• common.hh - size_t, ptrdiff_t, nv:: namespace, NV_ALIGN_OF and basic template tools
• STL - algorithm.hh, iterator.hh, limits.hh, numeric.hh and type_info.hh
• STL - updates to memory, array and string

Location:

trunk/src/formats

Files:

• md2_loader.cc (modified) (1 diff)
• md3_loader.cc (modified) (1 diff)
• md5_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (4 diffs)

trunk/src/formats/md2_loader.cc

@@ -238 +238 @@
 }
 
-size_t md2_loader::get_max_frames() const
+nv::size_t md2_loader::get_max_frames() const
 {
         return static_cast< size_t >( ((md2_t*)m_md2)->header.num_frames );

trunk/src/formats/md3_loader.cc

@@ -172 +172 @@
         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<std::size_t>( pos + surface->header.ofs_end ) ) return false;
+        if ( source.tell() != static_cast<size_t>( pos + surface->header.ofs_end ) ) return false;
 
         return true;

trunk/src/formats/md5_loader.cc

@@ -344 +344 @@
                 vtc.tangent  = glm::vec3(0);
 
-                std::sort( weights + start_weight, weights + start_weight + weight_count, [](const md5_weight& a, const md5_weight& b) -> bool { return a.bias > b.bias; } );
+                stable_sort( weights + start_weight, weights + start_weight + weight_count, [] ( const md5_weight& a, const md5_weight& b ) -> bool { return a.bias > b.bias; } );
+                //std::sort( weights + start_weight, weights + start_weight + weight_count, [](const md5_weight& a, const md5_weight& b) -> bool { return a.bias > b.bias; } );
 
                 if ( weight_count > 4 )

trunk/src/formats/obj_loader.cc

@@ -53 +53 @@
         std::string next_name;
 
-        std::size_t size;
-        bool        eof;
+        size_t size;
+        bool   eof;
 
         obj_reader();
@@ -172 +172 @@
 {
         mesh_data_reader( bool normals ) : m_normals( normals ) {}
-        virtual std::size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
+        virtual size_t add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
         {
                 if ( count < 3 ) return 0; // TODO : report error?
@@ -178 +178 @@
                 // TODO : support if normals not present;
                 vec3 nullvec;
-                std::size_t result = 0;
+                size_t result = 0;
                 // Simple triangulation - obj's shouldn't have more than quads anyway
 
@@ -278 +278 @@
                 }
 
-                for (std::size_t a = 0; a < count; ++a )
+                for (size_t a = 0; a < count; ++a )
                 {
                         const vec3& n = m_data[a].normal;