Changeset 323 for trunk/src/formats/assimp_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/assimp_loader.cc (modified) (7 diffs)

trunk/src/formats/assimp_loader.cc

@@ -14 +14 @@
 using namespace nv;
 
-const int MAX_BONES = 64;
+const unsigned MAX_BONES = 64;
 
 struct assimp_plain_vtx 
@@ -90 +90 @@
         m_mesh_count = 0;
         NV_LOG( nv::LOG_NOTICE, "AssImp loading file..." );
-        int size = (int)source.size();
+        size_t size = source.size();
         char* data  = new char[ size ];
         source.read( data, size, 1 );
@@ -159 +159 @@
                                         if ( v.boneweight[i] <= 0.0f ) 
                                         {
-                                                v.boneindex[i] = m;
+                                                v.boneindex[i]  = (int)m;
                                                 v.boneweight[i] = bone->mWeights[w].mWeight;
                                                 found = true;
@@ -289 +289 @@
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {
-                sint16 translate[MAX_BONES];
+                uint16 translate[MAX_BONES];
                 std::vector< mesh_node_data > bones;
                 const aiMesh*  mesh  = scene->mMeshes[ m ];
@@ -304 +304 @@
                                 {
                                         NV_ASSERT( final_bones.size() < MAX_BONES, "Too many bones to merge!" );
-                                        sint16 index = (sint16)final_bones.size();
+                                        uint16 index = (uint16)final_bones.size();
                                         final_bones.push_back( bone );
                                         names[ bone.name ] = index;
@@ -311 +311 @@
                                 else
                                 {
-                                        translate[b] = (sint16)iname->second;
+                                        translate[b] = iname->second;
                                 }
                         }
@@ -326 +326 @@
                                                 if ( vertex.boneweight[i] > 0.0f ) 
                                                 {
-                                                        vertex.boneindex[i] = translate[vertex.boneindex[i]];
+                                                        vertex.boneindex[i] = (int)translate[vertex.boneindex[i]];
                                                 }
                                         }