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

Fix build warnings

Browse source
This commit is contained in:
sabrina-shanman 2019-09-24 10:57:16 -07:00
parent 99386565b0
commit 725d4ee643
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/fbx/src/FBXSerializer.cpp
View file

@ -1480,7 +1480,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
// of skinning information in FBX // of skinning information in FBX
QString jointID = _connectionChildMap.value(clusterID); QString jointID = _connectionChildMap.value(clusterID);
hfmCluster.jointIndex = modelIDs.indexOf(jointID); hfmCluster.jointIndex = modelIDs.indexOf(jointID);
if (hfmCluster.jointIndex == -1) { if (hfmCluster.jointIndex == hfm::Cluster::INVALID_JOINT_INDEX) {
qCDebug(modelformat) << "Joint not in model list: " << jointID; qCDebug(modelformat) << "Joint not in model list: " << jointID;
hfmCluster.jointIndex = 0; hfmCluster.jointIndex = 0;
} }
@ -1514,7 +1514,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
{ {
HFMCluster cluster; HFMCluster cluster;
cluster.jointIndex = modelIDs.indexOf(modelID); cluster.jointIndex = modelIDs.indexOf(modelID);
if (cluster.jointIndex == -1) { if (cluster.jointIndex == hfm::Cluster::INVALID_JOINT_INDEX) {
qCDebug(modelformat) << "Model not in model list: " << modelID; qCDebug(modelformat) << "Model not in model list: " << modelID;
cluster.jointIndex = 0; cluster.jointIndex = 0;
} }

3
libraries/hfm/src/hfm/HFM.h
View file

@ -124,7 +124,8 @@ public:
/// A single binding to a joint. /// A single binding to a joint.
class Cluster { class Cluster {
public: public:
uint32_t jointIndex; static const uint32_t INVALID_JOINT_INDEX { (uint32_t)-1 };
uint32_t jointIndex { INVALID_JOINT_INDEX };
glm::mat4 inverseBindMatrix; glm::mat4 inverseBindMatrix;
Transform inverseBindTransform; Transform inverseBindTransform;
}; };

1
libraries/model-baker/src/model-baker/BuildGraphicsMeshTask.cpp
View file

@ -45,7 +45,6 @@ ReweightedDeformers getReweightedDeformers(size_t numMeshVertices, const hfm::Dy
weightAccumulators.resize(numClusterIndices, 0.0f); weightAccumulators.resize(numClusterIndices, 0.0f);
for (uint16_t i = 0; i < (uint16_t)deformers.size(); ++i) { for (uint16_t i = 0; i < (uint16_t)deformers.size(); ++i) {
const hfm::Deformer& deformer = *deformers[i]; const hfm::Deformer& deformer = *deformers[i];
const hfm::Cluster& cluster = dynamicTransform->clusters[i];
if (deformer.indices.size() != deformer.weights.size()) { if (deformer.indices.size() != deformer.weights.size()) {
reweightedDeformers.trimmedToMatch = true; reweightedDeformers.trimmedToMatch = true;