Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded

Browse source
This commit is contained in:
Ryan Huffman 2017-09-12 09:44:44 -07:00
parent 1b2ba3acb6
commit 8fc8b8100d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/baking/src/FBXBaker.cpp
View file

@ -297,15 +297,16 @@ void FBXBaker::rewriteAndBakeSceneModels() {
int64_t numTriangles { 0 }; int64_t numTriangles { 0 };
for (auto& part : mesh.parts) { for (auto& part : mesh.parts) {
Q_ASSERT(part.quadTrianglesIndices.size() % 3 == 0); if ((part.quadTrianglesIndices.size() % 3) != 0 || (part.triangleIndices.size() % 3) != 0) {
Q_ASSERT(part.triangleIndices.size() % 3 == 0); handleWarning("Found a mesh part with invalid index data, skipping");
continue;
}
numTriangles += part.quadTrianglesIndices.size() / 3; numTriangles += part.quadTrianglesIndices.size() / 3;
numTriangles += part.triangleIndices.size() / 3; numTriangles += part.triangleIndices.size() / 3;
} }
if (numTriangles == 0) { if (numTriangles == 0) {
qDebug() << "Skipping compression of mesh because no triangles were found"; handleWarning("Skipping compression of mesh because no triangles were found");
continue; continue;
} }
@ -317,7 +318,7 @@ void FBXBaker::rewriteAndBakeSceneModels() {
bool hasColors { mesh.colors.size() > 0 }; bool hasColors { mesh.colors.size() > 0 };
bool hasTexCoords { mesh.texCoords.size() > 0 }; bool hasTexCoords { mesh.texCoords.size() > 0 };
bool hasTexCoords1 { mesh.texCoords1.size() > 0 }; bool hasTexCoords1 { mesh.texCoords1.size() > 0 };
bool hasPerFaceMaterials { mesh.parts.size() > 0 }; bool hasPerFaceMaterials { mesh.parts.size() > 1 };
int normalsAttributeID { -1 }; int normalsAttributeID { -1 };
int colorsAttributeID { -1 }; int colorsAttributeID { -1 };
@ -403,7 +404,7 @@ void FBXBaker::rewriteAndBakeSceneModels() {
auto dracoMesh = meshBuilder.Finalize(); auto dracoMesh = meshBuilder.Finalize();
if (!dracoMesh) { if (!dracoMesh) {
qWarning() << "Failed to finalize the baking of a draco Geometry node"; handleWarning("Failed to finalize the baking of a draco Geometry node");
continue; continue;
} }