diff --git a/tools/assimp_cmd/ImageExtractor.cpp b/tools/assimp_cmd/ImageExtractor.cpp index ecee46c1d..e1a2e7728 100644 --- a/tools/assimp_cmd/ImageExtractor.cpp +++ b/tools/assimp_cmd/ImageExtractor.cpp @@ -317,13 +317,13 @@ int Assimp_Extract (const char* const* params, unsigned int num) // check whether the requested texture is existing if (texIdx >= scene->mNumTextures) { - ::printf("assimp extract: Texture %i requested, but there are just %i textures\n", + ::printf("assimp extract: Texture %u requested, but there are just %u textures\n", texIdx, scene->mNumTextures); return 6; } } else { - ::printf("assimp extract: Exporting %i textures\n",scene->mNumTextures); + ::printf("assimp extract: Exporting %u textures\n",scene->mNumTextures); } // now write all output textures @@ -347,7 +347,7 @@ int Assimp_Extract (const char* const* params, unsigned int num) // if the texture is a compressed one, we'll export // it to its native file format if (!tex->mHeight) { - printf("assimp extract: Texture %i is compressed (%s). Writing native file format.\n", + printf("assimp extract: Texture %u is compressed (%s). Writing native file format.\n", i,tex->achFormatHint); // modify file extension @@ -369,7 +369,7 @@ int Assimp_Extract (const char* const* params, unsigned int num) else m = DoExport(tex,p,extension,flags); ::fclose(p); - printf("assimp extract: Wrote texture %i to %s\n",i, out_cpy.c_str()); + printf("assimp extract: Wrote texture %u to %s\n",i, out_cpy.c_str()); if (texIdx != 0xffffffff) return m; } diff --git a/tools/assimp_cmd/Info.cpp b/tools/assimp_cmd/Info.cpp index de11150ff..b2a710284 100644 --- a/tools/assimp_cmd/Info.cpp +++ b/tools/assimp_cmd/Info.cpp @@ -191,7 +191,7 @@ void PrintHierarchy(const aiNode* root, unsigned int maxnest, unsigned int maxli for(unsigned int i = 0; i < cnest; ++i) { printf("-- "); } - printf("\'%s\', meshes: %i\n",root->mName.data,root->mNumMeshes); + printf("\'%s\', meshes: %u\n",root->mName.data,root->mNumMeshes); for (unsigned int i = 0; i < root->mNumChildren; ++i ) { PrintHierarchy(root->mChildren[i],maxnest,maxline,cline,cnest+1); if(i == root->mNumChildren-1) { diff --git a/tools/assimp_cmd/WriteDumb.cpp b/tools/assimp_cmd/WriteDumb.cpp index efc27a935..3e12e1038 100644 --- a/tools/assimp_cmd/WriteDumb.cpp +++ b/tools/assimp_cmd/WriteDumb.cpp @@ -748,17 +748,17 @@ void WriteNode(const aiNode* node, FILE* out, unsigned int depth) prefix,m.d1,m.d2,m.d3,m.d4,prefix); if (node->mNumMeshes) { - fprintf(out, "%s\t\n%s\t", + fprintf(out, "%s\t\n%s\t", prefix,node->mNumMeshes,prefix); for (unsigned int i = 0; i < node->mNumMeshes;++i) { - fprintf(out,"%i ",node->mMeshes[i]); + fprintf(out,"%u ",node->mMeshes[i]); } fprintf(out,"\n%s\t\n",prefix); } if (node->mNumChildren) { - fprintf(out,"%s\t\n", + fprintf(out,"%s\t\n", prefix,node->mNumChildren); for (unsigned int i = 0; i < node->mNumChildren;++i) { @@ -853,13 +853,13 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd "\n\n" "" " \n\n" - "\n", + "\n", aiGetVersionMajor(),aiGetVersionMinor(),aiGetVersionRevision(),src,c.c_str(),asctime(p), scene->mFlags, @@ -936,7 +936,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write textures if (scene->mNumTextures) { - fprintf(out,"\n",scene->mNumTextures); + fprintf(out,"\n",scene->mNumTextures); for (unsigned int i = 0; i < scene->mNumTextures;++i) { aiTexture* tex = scene->mTextures[i]; bool compressed = (tex->mHeight == 0); @@ -947,7 +947,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd (compressed ? "true" : "false")); if (compressed) { - fprintf(out,"\t\t \n",tex->mWidth); + fprintf(out,"\t\t \n",tex->mWidth); if (!shortened) { for (unsigned int n = 0; n < tex->mWidth;++n) { @@ -981,12 +981,12 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write materials if (scene->mNumMaterials) { - fprintf(out,"\n",scene->mNumMaterials); + fprintf(out,"\n",scene->mNumMaterials); for (unsigned int i = 0; i< scene->mNumMaterials; ++i) { const aiMaterial* mat = scene->mMaterials[i]; fprintf(out,"\t\n"); - fprintf(out,"\t\t\n",mat->mNumProperties); + fprintf(out,"\t\t\n",mat->mNumProperties); for (unsigned int n = 0; n < mat->mNumProperties;++n) { const aiMaterialProperty* prop = mat->mProperties[n]; @@ -1004,7 +1004,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd sz = "binary_buffer"; } - fprintf(out,"\t\t\tmKey.data, sz, ::TextureTypeToString((aiTextureType)prop->mSemantic),prop->mIndex); @@ -1048,7 +1048,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write animations if (scene->mNumAnimations) { - fprintf(out,"\n",scene->mNumAnimations); + fprintf(out,"\n",scene->mNumAnimations); for (unsigned int i = 0; i < scene->mNumAnimations;++i) { aiAnimation* anim = scene->mAnimations[i]; @@ -1059,7 +1059,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write bone animation channels if (anim->mNumChannels) { - fprintf(out,"\t\t\n",anim->mNumChannels); + fprintf(out,"\t\t\n",anim->mNumChannels); for (unsigned int n = 0; n < anim->mNumChannels;++n) { aiNodeAnim* nd = anim->mChannels[n]; @@ -1070,7 +1070,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd if (!shortened) { // write position keys if (nd->mNumPositionKeys) { - fprintf(out,"\t\t\t\t\n",nd->mNumPositionKeys); + fprintf(out,"\t\t\t\t\n",nd->mNumPositionKeys); for (unsigned int a = 0; a < nd->mNumPositionKeys;++a) { aiVectorKey* vc = nd->mPositionKeys+a; fprintf(out,"\t\t\t\t\t\n" @@ -1082,7 +1082,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write scaling keys if (nd->mNumScalingKeys) { - fprintf(out,"\t\t\t\t\n",nd->mNumScalingKeys); + fprintf(out,"\t\t\t\t\n",nd->mNumScalingKeys); for (unsigned int a = 0; a < nd->mNumScalingKeys;++a) { aiVectorKey* vc = nd->mScalingKeys+a; fprintf(out,"\t\t\t\t\t\n" @@ -1094,7 +1094,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write rotation keys if (nd->mNumRotationKeys) { - fprintf(out,"\t\t\t\t\n",nd->mNumRotationKeys); + fprintf(out,"\t\t\t\t\n",nd->mNumRotationKeys); for (unsigned int a = 0; a < nd->mNumRotationKeys;++a) { aiQuatKey* vc = nd->mRotationKeys+a; fprintf(out,"\t\t\t\t\t\n" @@ -1115,13 +1115,13 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // write meshes if (scene->mNumMeshes) { - fprintf(out,"\n",scene->mNumMeshes); + fprintf(out,"\n",scene->mNumMeshes); for (unsigned int i = 0; i < scene->mNumMeshes;++i) { aiMesh* mesh = scene->mMeshes[i]; // const unsigned int width = (unsigned int)log10((double)mesh->mNumVertices)+1; // mesh header - fprintf(out,"\t\n", + fprintf(out,"\t\n", (mesh->mPrimitiveTypes & aiPrimitiveType_POINT ? "points" : ""), (mesh->mPrimitiveTypes & aiPrimitiveType_LINE ? "lines" : ""), (mesh->mPrimitiveTypes & aiPrimitiveType_TRIANGLE ? "triangles" : ""), @@ -1130,7 +1130,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // bones if (mesh->mNumBones) { - fprintf(out,"\t\t\n",mesh->mNumBones); + fprintf(out,"\t\t\n",mesh->mNumBones); for (unsigned int n = 0; n < mesh->mNumBones;++n) { aiBone* bone = mesh->mBones[n]; @@ -1151,13 +1151,13 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd bone->mOffsetMatrix.d1,bone->mOffsetMatrix.d2,bone->mOffsetMatrix.d3,bone->mOffsetMatrix.d4); if (!shortened && bone->mNumWeights) { - fprintf(out,"\t\t\t\t\n",bone->mNumWeights); + fprintf(out,"\t\t\t\t\n",bone->mNumWeights); // bone weights for (unsigned int a = 0; a < bone->mNumWeights;++a) { aiVertexWeight* wght = bone->mWeights+a; - fprintf(out,"\t\t\t\t\t\n\t\t\t\t\t\t%f\n\t\t\t\t\t\n", + fprintf(out,"\t\t\t\t\t\n\t\t\t\t\t\t%f\n\t\t\t\t\t\n", wght->mVertexId,wght->mWeight); } fprintf(out,"\t\t\t\t\n"); @@ -1169,14 +1169,14 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // faces if (!shortened && mesh->mNumFaces) { - fprintf(out,"\t\t\n",mesh->mNumFaces); + fprintf(out,"\t\t\n",mesh->mNumFaces); for (unsigned int n = 0; n < mesh->mNumFaces; ++n) { aiFace& f = mesh->mFaces[n]; - fprintf(out,"\t\t\t\n" + fprintf(out,"\t\t\t\n" "\t\t\t\t",f.mNumIndices); for (unsigned int j = 0; j < f.mNumIndices;++j) - fprintf(out,"%i ",f.mIndices[j]); + fprintf(out,"%u ",f.mIndices[j]); fprintf(out,"\n\t\t\t\n"); } @@ -1185,7 +1185,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // vertex positions if (mesh->HasPositions()) { - fprintf(out,"\t\t \n",mesh->mNumVertices); + fprintf(out,"\t\t \n",mesh->mNumVertices); if (!shortened) { for (unsigned int n = 0; n < mesh->mNumVertices; ++n) { fprintf(out,"\t\t%0 8f %0 8f %0 8f\n", @@ -1199,7 +1199,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // vertex normals if (mesh->HasNormals()) { - fprintf(out,"\t\t \n",mesh->mNumVertices); + fprintf(out,"\t\t \n",mesh->mNumVertices); if (!shortened) { for (unsigned int n = 0; n < mesh->mNumVertices; ++n) { fprintf(out,"\t\t%0 8f %0 8f %0 8f\n", @@ -1215,7 +1215,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // vertex tangents and bitangents if (mesh->HasTangentsAndBitangents()) { - fprintf(out,"\t\t \n",mesh->mNumVertices); + fprintf(out,"\t\t \n",mesh->mNumVertices); if (!shortened) { for (unsigned int n = 0; n < mesh->mNumVertices; ++n) { fprintf(out,"\t\t%0 8f %0 8f %0 8f\n", @@ -1226,7 +1226,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd } fprintf(out,"\t\t\n"); - fprintf(out,"\t\t \n",mesh->mNumVertices); + fprintf(out,"\t\t \n",mesh->mNumVertices); if (!shortened) { for (unsigned int n = 0; n < mesh->mNumVertices; ++n) { fprintf(out,"\t\t%0 8f %0 8f %0 8f\n", @@ -1243,7 +1243,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd if (!mesh->mTextureCoords[a]) break; - fprintf(out,"\t\t \n",mesh->mNumVertices, + fprintf(out,"\t\t \n",mesh->mNumVertices, a,mesh->mNumUVComponents[a]); if (!shortened) { @@ -1270,7 +1270,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd for (unsigned int a = 0; a < AI_MAX_NUMBER_OF_COLOR_SETS; ++a) { if (!mesh->mColors[a]) break; - fprintf(out,"\t\t \n",mesh->mNumVertices,a); + fprintf(out,"\t\t \n",mesh->mNumVertices,a); if (!shortened) { for (unsigned int n = 0; n < mesh->mNumVertices; ++n) { fprintf(out,"\t\t%0 8f %0 8f %0 8f %0 8f\n", diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp index a1d113aea..f910a7f2c 100644 --- a/tools/assimp_view/Display.cpp +++ b/tools/assimp_view/Display.cpp @@ -169,7 +169,7 @@ int CDisplay::AddNodeToDisplayList( iIndex += iDepth * 100; } else iIndex += iDepth * 10; - sprintf(chTemp,"Node %i",iIndex); + sprintf(chTemp,"Node %u",iIndex); } else { sprintf(chTemp,"%s",pcNode->mName.data); @@ -222,7 +222,7 @@ int CDisplay::AddMeshToDisplayList(unsigned int iIndex, HTREEITEM hRoot) char chTemp[MAXLEN]; if(0 == pcMesh->mName.length) { - sprintf(chTemp,"Mesh %i",iIndex); + sprintf(chTemp,"Mesh %u",iIndex); } else { sprintf(chTemp,"%s",pcMesh->mName.data); @@ -1028,7 +1028,7 @@ int CDisplay::OnSetupTextureView(TextureInfo* pcNew) sprintf(szTemp,"%i",(*pcNew->piTexture)->GetLevelCount()); SetWindowText(GetDlgItem(g_hDlg,IDC_ESHADER),szTemp); - sprintf(szTemp,"%i",pcNew->iUV); + sprintf(szTemp,"%u",pcNew->iUV); SetWindowText(GetDlgItem(g_hDlg,IDC_EMAT),szTemp); sprintf(szTemp,"%f",pcNew->fBlend);