Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:19:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update FBXBaker to bake triangleIndices and fix faces being lost

Browse source
This commit is contained in:
Ryan Huffman 2017-09-12 19:51:49 -07:00 committed by Stephen Birarda
parent b253d3b57c
commit c9024f5e87
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,19 +354,15 @@ void FBXBaker::rewriteAndBakeSceneModels() {
auto partIndex = 0; auto partIndex = 0;
draco::FaceIndex face;
for (auto& part : mesh.parts) { for (auto& part : mesh.parts) {
//Q_ASSERT(part.quadTrianglesIndices % 3 == 0);
//Q_ASSERT(part.triangleIndices % 3 == 0);
const auto matTex = extractedMesh.partMaterialTextures[partIndex]; const auto matTex = extractedMesh.partMaterialTextures[partIndex];
const int64_t matTexData[2] = { matTex.first, matTex.second }; const int64_t matTexData[2] = { matTex.first, matTex.second };
for (int i = 0; (i + 2) < part.quadTrianglesIndices.size(); i += 3) { auto addFace = [&](QVector<int>& indices, int index, draco::FaceIndex face) {
auto idx0 = part.quadTrianglesIndices[i]; auto idx0 = indices[index];
auto idx1 = part.quadTrianglesIndices[i + 1]; auto idx1 = indices[index + 1];
auto idx2 = part.quadTrianglesIndices[i + 2]; auto idx2 = indices[index + 2];
auto face = draco::FaceIndex(i / 3);
if (hasPerFaceMaterials) { if (hasPerFaceMaterials) {
meshBuilder.SetPerFaceAttributeValueForFace(faceMaterialAttributeID, face, &matTexData); meshBuilder.SetPerFaceAttributeValueForFace(faceMaterialAttributeID, face, &matTexData);
@ -378,7 +374,7 @@ void FBXBaker::rewriteAndBakeSceneModels() {
if (hasNormals) { if (hasNormals) {
meshBuilder.SetAttributeValuesForFace(normalsAttributeID, face, meshBuilder.SetAttributeValuesForFace(normalsAttributeID, face,
&mesh.normals[idx0],&mesh.normals[idx1], &mesh.normals[idx0], &mesh.normals[idx1],
&mesh.normals[idx2]); &mesh.normals[idx2]);
} }
if (hasColors) { if (hasColors) {
@ -396,6 +392,13 @@ void FBXBaker::rewriteAndBakeSceneModels() {
&mesh.texCoords1[idx0], &mesh.texCoords1[idx1], &mesh.texCoords1[idx0], &mesh.texCoords1[idx1],
&mesh.texCoords1[idx2]); &mesh.texCoords1[idx2]);
} }
};
for (int i = 0; (i + 2) < part.quadTrianglesIndices.size(); i += 3) {
addFace(part.quadTrianglesIndices, i, face++);
}
for (int i = 0; (i + 2) < part.triangleIndices.size(); i += 3) {
addFace(part.triangleIndices, i, face++);
} }
partIndex++; partIndex++;