v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2546 from Frooxius/master 

Some FBX multi-material mesh fixes
pull/2487/head^2
Kim Kulling 2019-07-14 13:10:03 +02:00 committed by GitHub
parent 4a2df57241 bcdb173e09
commit b344beb00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/FBX/FBXConverter.cpp
View File

@ -1247,10 +1247,10 @@ namespace Assimp {
ai_assert(count_faces); ai_assert(count_faces);
ai_assert(count_vertices); ai_assert(count_vertices);
// mapping from output indices to DOM indexing, needed to resolve weights // mapping from output indices to DOM indexing, needed to resolve weights or blendshapes
std::vector<unsigned int> reverseMapping; std::vector<unsigned int> reverseMapping;
std::map<unsigned int, unsigned int> translateIndexMap; std::map<unsigned int, unsigned int> translateIndexMap;
if (process_weights) { if (process_weights || mesh.GetBlendShapes().size() > 0) {
reverseMapping.resize(count_vertices); reverseMapping.resize(count_vertices);
} }
@ -1407,7 +1407,10 @@ namespace Assimp {
unsigned int count = 0; unsigned int count = 0;
const unsigned int* outIndices = mesh.ToOutputVertexIndex(index, count); const unsigned int* outIndices = mesh.ToOutputVertexIndex(index, count);
for (unsigned int k = 0; k < count; k++) { for (unsigned int k = 0; k < count; k++) {
unsigned int index = translateIndexMap[outIndices[k]]; unsigned int outIndex = outIndices[k];
if (translateIndexMap.find(outIndex) == translateIndexMap.end())
continue;
unsigned int index = translateIndexMap[outIndex];
animMesh->mVertices[index] += vertex; animMesh->mVertices[index] += vertex;
if (animMesh->mNormals != nullptr) { if (animMesh->mNormals != nullptr) {
animMesh->mNormals[index] += normal; animMesh->mNormals[index] += normal;
@ -1421,6 +1424,15 @@ namespace Assimp {
} }
} }
const size_t numAnimMeshes = animMeshes.size();
if (numAnimMeshes > 0) {
out_mesh->mNumAnimMeshes = static_cast<unsigned int>(numAnimMeshes);
out_mesh->mAnimMeshes = new aiAnimMesh*[numAnimMeshes];
for (size_t i = 0; i < numAnimMeshes; i++) {
out_mesh->mAnimMeshes[i] = animMeshes.at(i);
}
}
return static_cast<unsigned int>(meshes.size() - 1); return static_cast<unsigned int>(meshes.size() - 1);
} }