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

Revert to previous clusterIndices and clusterWeight expansion implementation.

Browse source
This commit is contained in:
Saracen 2019-04-29 21:26:13 +01:00
parent 95ec51e37b
commit a075074303
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1252,10 +1252,16 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
const float ALMOST_HALF = 0.499f; const float ALMOST_HALF = 0.499f;
int numVertices = mesh.vertices.size() - prevMeshVerticesCount; int numVertices = mesh.vertices.size() - prevMeshVerticesCount;
mesh.clusterIndices.resize(mesh.clusterIndices.size() // Append new cluster indices and weights for this mesh part
+ numVertices * WEIGHTS_PER_VERTEX); for (int i = 0; i < numVertices * WEIGHTS_PER_VERTEX; i++) {
mesh.clusterWeights.resize(mesh.clusterWeights.size() mesh.clusterIndices.push_back(mesh.clusters.size() - 1);
+ numVertices * WEIGHTS_PER_VERTEX); mesh.clusterWeights.push_back(0);
}
for (int c = 0; c < clusterJoints.size(); c++) {
mesh.clusterIndices[prevMeshClusterIndexCount + c] =
originalToNewNodeIndexMap[_file.skins[node.skin].joints[clusterJoints[c]]];
}
// normalize and compress to 16-bits // normalize and compress to 16-bits
for (int i = 0; i < numVertices; ++i) { for (int i = 0; i < numVertices; ++i) {
@ -1263,9 +1269,6 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
float totalWeight = 0.0f; float totalWeight = 0.0f;
for (int k = j; k < j + WEIGHTS_PER_VERTEX; ++k) { for (int k = j; k < j + WEIGHTS_PER_VERTEX; ++k) {
mesh.clusterIndices[prevMeshClusterIndexCount + k] =
originalToNewNodeIndexMap[_file.skins[node.skin].joints[clusterJoints[k]]];
totalWeight += clusterWeights[k]; totalWeight += clusterWeights[k];
} }
if (totalWeight > 0.0f) { if (totalWeight > 0.0f) {
@ -1275,9 +1278,6 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
} }
} else { } else {
mesh.clusterWeights[prevMeshClusterWeightCount + j] = (uint16_t)((float)(UINT16_MAX) + ALMOST_HALF); mesh.clusterWeights[prevMeshClusterWeightCount + j] = (uint16_t)((float)(UINT16_MAX) + ALMOST_HALF);
for (int k = j + 1; k < j + WEIGHTS_PER_VERTEX; ++k) {
mesh.clusterWeights[prevMeshClusterWeightCount + k] = 0;
}
} }
} }
} }