From 108d331d86923ffd1783ad5bd3a2ede8366c16f2 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Mon, 14 Oct 2019 17:45:07 -0700 Subject: [PATCH] more --- libraries/fbx/src/FBXSerializer.cpp | 2 +- libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp | 2 +- libraries/render-utils/src/Model.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp index 58a9ed2570..f15443aeb5 100644 --- a/libraries/fbx/src/FBXSerializer.cpp +++ b/libraries/fbx/src/FBXSerializer.cpp @@ -1653,7 +1653,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const int oldIndex = fbxCluster.indices[i]; uint32_t newIndex = (uint32_t)extracted.newIndices.value(oldIndex); deformer.indices.push_back(newIndex); - deformer.indices.push_back((float)fbxCluster.weights[i]); + deformer.weights.push_back((float)fbxCluster.weights[i]); } } diff --git a/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp b/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp index 8c27968de9..7fefe614d4 100644 --- a/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp +++ b/libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp @@ -95,7 +95,7 @@ void buildGraphicsMesh(const hfm::Mesh& hfmMesh, graphics::MeshPointer& graphics HIFI_FCDEBUG_ID(model_baker(), repeatMessageID, "BuildGraphicsMeshTask -- The number of indices and weights for a deformer had different sizes and have been trimmed to match"); } // Record cluster sizes - const size_t numVertClusters = (reweightedDeformers.weightsPerVertex ? hfmMesh.clusterIndices.size() / reweightedDeformers.weightsPerVertex : 0); + const size_t numVertClusters = (reweightedDeformers.weightsPerVertex ? reweightedDeformers.indices.size() / reweightedDeformers.weightsPerVertex : 0); const size_t clusterIndicesSize = numVertClusters * clusterIndiceElement.getSize(); const size_t clusterWeightsSize = numVertClusters * clusterWeightElement.getSize(); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 27e8725572..56dadf0537 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -257,7 +257,7 @@ void Model::updateRenderItems() { Transform renderTransform = modelTransform; // if (meshState.clusterMatrices.size() <= 1) { - renderTransform = modelTransform.worldTransform(shapeState._rootFromJointTransform); + renderTransform = modelTransform.worldTransform(shapeState._rootFromJointTransform); // } data.updateTransform(renderTransform);