Changeset 204 for trunk/src/formats

Timestamp:

08/17/13 21:22:56 (12 years ago)

Author:

cahir

Message:

Fix warnings on MacOSX 64-bit with clang 3.3

Location:

trunk/src/formats

Files:

• md2_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (3 diffs)

trunk/src/formats/md2_loader.cc

@@ -357 +357 @@
         uint32 stats_collision  = 0;
 
-        std::vector< sint32 > index_translation( md2->header.num_vertices, -1 );
+        std::vector< sint32 > index_translation( static_cast< uint32 >( md2->header.num_vertices ), -1 );
 
         m_new_indexes.clear();

trunk/src/formats/obj_loader.cc

@@ -130 +130 @@
 };
 
-std::size_t mesh_obj_reader::add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
+size_t mesh_obj_reader::add_face( uint32* vi, uint32* ti, uint32* ni, size_t count )
 {
         if ( count < 3 )
@@ -181 +181 @@
         std::vector< vec4 >& tg = m_tangent->get();
 
-        std::size_t count  = vp.size();
-        std::size_t tcount = count / 3;
+        size_t count  = vp.size();
+        size_t tcount = count / 3;
 
         std::vector< vec3 > tan1( count );
@@ -188 +188 @@
         tg.resize( count );
 
-        for (std::size_t a = 0; a < tcount; ++a )
-        {
-                uint32 i1 = a * 3;
-                uint32 i2 = a * 3 + 1;
-                uint32 i3 = a * 3 + 2;
+        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;
 
                 // TODO: simplify