Changeset 323 for trunk/src/formats/md5_loader.cc

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/src/formats/md5_loader.cc (modified) (5 diffs)

trunk/src/formats/md5_loader.cc

@@ -135 +135 @@
                         mesh_data* mesh = new mesh_data("md5_mesh");
 
-                        int num_verts   = 0;
-                        int num_tris    = 0;
-                        int num_weights = 0;
+                        uint32 num_verts   = 0;
+                        uint32 num_tris    = 0;
+                        uint32 num_weights = 0;
 
                         discard( sstream, "{" );
@@ -170 +170 @@
                                         next_line( sstream );
                                         std::string line;
-                                        for ( int i = 0; i < num_verts; ++i )
+                                        for ( uint32 i = 0; i < num_verts; ++i )
                                         {
                                                 size_t weight_count;
@@ -194 +194 @@
                                         next_line( sstream );
                                         std::string line;
-                                        for ( int i = 0; i < num_tris; ++i )
+                                        for ( uint32 i = 0; i < num_tris; ++i )
                                         {
                                                 size_t ti0;
@@ -214 +214 @@
                                         next_line( sstream );
                                         std::string line;
-                                        for ( int i = 0; i < num_weights; ++i )
+                                        for ( uint32 i = 0; i < num_weights; ++i )
                                         {
                                                 md5_weight weight;
@@ -368 +368 @@
                         if ( j < weight_count )
                         {
-                                vdata.boneindex[j]  = weights[start_weight + j].joint_id;
+                                vdata.boneindex[j]  = (int)weights[start_weight + j].joint_id;
                                 vdata.boneweight[j] = weights[start_weight + j].bias;
                         }