Changeset 200

Timestamp:

08/11/13 18:06:12 (12 years ago)

Author:

epyon

Message:

• compilation and warning fixes

Location:

trunk

Files:

• nv/array2d.hh (modified) (2 diffs)
• nv/common.hh (modified) (1 diff)
• nv/formats/md5_loader.hh (modified) (3 diffs)
• nv/string.hh (modified) (1 diff)
• src/formats/md2_loader.cc (modified) (1 diff)
• src/formats/md3_loader.cc (modified) (2 diffs)
• src/formats/md5_loader.cc (modified) (7 diffs)

trunk/nv/array2d.hh

@@ -330 +330 @@
                         // Copy into THIS array from source the following.
                         // Highest row is either the size limit or the end of either array, whichever is smaller.
-                        for ( i = 0; i < min( size_y , min ( m_size.y - dest_start_y, source.m_size.y - source_start_y ) ); i++ )
+                        for ( uint32 i = 0; i < min( size_y , min ( m_size.y - dest_start_y, source.m_size.y - source_start_y ) ); i++ )
                         {
                                 // Copy the indicated row.
@@ -338 +338 @@
                                 std:copy( source.m_data + ( source_start_y + i ) * source.m_size.x + source_start_x,  // Source Start
                                                   source.m_data + ( source_start_y + i ) * source.m_size.x + min( source.m_size.x, min( source_start_x + size_x, source_start_x + m_size.x - dest_start_x ) ), // Source End
-                                                  m_data + (dest_start_y + i) * m_size.x + dest_start_x ) // Destination Start
+                                                  m_data + (dest_start_y + i) * m_size.x + dest_start_x ); // Destination Start
                         }
                 }

trunk/nv/common.hh

@@ -198 +198 @@
 T narrow_cast(const U& a)
 {
-        return static_cast<T>(a & T(0xFFFFFFFFFFFFFFFF) );
+        return static_cast<T>(a & T(-1) );
 }
 

trunk/nv/formats/md5_loader.hh

@@ -31 +31 @@
                         int         parent_id;
                         int         flags;
-                        int         start_index;
+                        size_t      start_index;
                 };
                 typedef std::vector<md5_joint_info> md5_joint_info_list;
@@ -162 +162 @@
                 struct md5_triangle
                 {
-                        int indices[3];
+                        size_t indices[3];
                 };
                 typedef std::vector<md5_triangle> md5_triangle_list;
@@ -168 +168 @@
                 struct md5_weight
                 {
-                        int       joint_id;
+                        size_t    joint_id;
                         float     bias;
                         glm::vec3 pos;

trunk/nv/string.hh

@@ -135 +135 @@
         };
         template< size_t S >
+        struct string_length< char[S] >
+        {
+                static size_t get( const char[S] ) { return S-1; }
+        };
+        template< size_t S >
         struct string_length< const char[S] >
         {
-                static size_t get( const char* ) { return S-1; }
+                static size_t get( const char[S] ) { return S-1; }
         };
         template<>

trunk/src/formats/md2_loader.cc

@@ -8 +8 @@
 
 #include <glm/gtc/constants.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include "nv/logging.hh"
 #include <cstring>

trunk/src/formats/md3_loader.cc

@@ -8 +8 @@
 
 #include <glm/gtc/constants.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include "nv/logging.hh"
 #include <cstring>
@@ -457 +456 @@
         {
                 const md3_surface_t& surface = md3->surfaces[i];
-                const sint32         vcount  = surface.header.num_verts;
+                const uint32         vcount  = static_cast< uint32 >( surface.header.num_verts );
                 t.reserve( t.size() + vcount );
-                for (sint32 j = 0; j < vcount; ++j )
+                for (uint32 j = 0; j < vcount; ++j )
                 {
                         t.push_back( md3_texcoord( surface.st[j] ) );

trunk/src/formats/md5_loader.cc

@@ -8 +8 @@
 
 #include <glm/gtc/constants.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include "nv/logging.hh"
 #include "nv/io/std_stream.hh"
@@ -194 +193 @@
                 vert.tangent  = glm::vec3(0);
 
-                for ( int j = 0; j < vert.weight_count; ++j )
+                for ( size_t j = 0; j < vert.weight_count; ++j )
                 {
                         md5_weight& weight = mesh.weights[vert.start_weight + j];
@@ -246 +245 @@
         }
 
-        for ( unsigned int i = 0; i < mesh.verts.size(); ++i )
+        for ( size_t i = 0; i < mesh.verts.size(); ++i )
         {
                 md5_vertex& vert = mesh.verts[i];
@@ -258 +257 @@
                 vert.tangent = glm::vec3(0);
 
-                for ( int j = 0; j < vert.weight_count; ++j )
+                for ( size_t j = 0; j < vert.weight_count; ++j )
                 {
                         const md5_weight& weight = mesh.weights[vert.start_weight + j];
@@ -455 +454 @@
 
         float frame_num = m_anim_time * (float)m_frame_rate;
-        int frame0 = (int)floorf( frame_num );
-        int frame1 = (int)ceilf( frame_num );
+        size_t frame0 = (size_t)floorf( frame_num );
+        size_t frame1 = (size_t)ceilf( frame_num );
         frame0 = frame0 % m_num_frames;
         frame1 = frame1 % m_num_frames;
@@ -489 +488 @@
                 if ( animated_joint.parent >= 0 ) // Has a parent joint
                 {
-                        md5_skeleton_joint& pjoint = skeleton.joints[animated_joint.parent];
+                        md5_skeleton_joint& pjoint = skeleton.joints[static_cast< size_t >( animated_joint.parent ) ];
                         glm::vec3 rot_pos = pjoint.orient * animated_joint.pos;
 
@@ -553 +552 @@
                 tangent = glm::vec3(0);
 
-                for ( int j = 0; j < vert.weight_count; ++j )
+                for ( size_t j = 0; j < vert.weight_count; ++j )
                 {
                         const md5_weight& weight = mesh.weights[vert.start_weight + j];