From c50410f487e33a40ee629484a7b3cf3ddce559bc Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Mon, 29 Jun 2009 14:58:06 +0000 Subject: [PATCH] FIX: Dump contains material index now. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@447 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- tools/assimp_cmd/CompareDump.cpp | 1 + tools/assimp_cmd/WriteDumb.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/assimp_cmd/CompareDump.cpp b/tools/assimp_cmd/CompareDump.cpp index e69de29bb..d3f5a12fa 100644 --- a/tools/assimp_cmd/CompareDump.cpp +++ b/tools/assimp_cmd/CompareDump.cpp @@ -0,0 +1 @@ + diff --git a/tools/assimp_cmd/WriteDumb.cpp b/tools/assimp_cmd/WriteDumb.cpp index 5e5a677c7..683da16e6 100644 --- a/tools/assimp_cmd/WriteDumb.cpp +++ b/tools/assimp_cmd/WriteDumb.cpp @@ -339,6 +339,7 @@ void WriteBinaryDump(const aiScene* scene, FILE* out, const char* src, const cha WriteInteger(mesh->mNumBones,out); WriteInteger(mesh->mNumFaces,out); WriteInteger(mesh->mNumVertices,out); + WriteInteger(mesh->mMaterialIndex,out); // write bones if (mesh->mNumBones) { @@ -780,12 +781,13 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd // mesh header ::fprintf(out,"\t\n" "\t\t %i \n" - "\t\t %i \n", + "\t\t %i \n" + "\t\t %i \n", (mesh->mPrimitiveTypes & aiPrimitiveType_POINT ? "points" : ""), (mesh->mPrimitiveTypes & aiPrimitiveType_LINE ? "lines" : ""), (mesh->mPrimitiveTypes & aiPrimitiveType_TRIANGLE ? "triangles" : ""), (mesh->mPrimitiveTypes & aiPrimitiveType_POLYGON ? "polygons" : ""), - mesh->mNumVertices,mesh->mNumFaces); + mesh->mNumVertices,mesh->mNumFaces,mesh->mMaterialIndex); // bones for (unsigned int n = 0; n < mesh->mNumBones;++n) { @@ -991,7 +993,7 @@ int Assimp_Dump (const char** params, unsigned int num) s = in.length(); out = in.substr(0,s); - out.append((binary ? ".assfile" : ".xml")); + out.append((binary ? ".assbin" : ".assxml")); if (shortened && binary) out.append(".regress"); }