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

Fix not building due to removed shape.transform

Browse source
This commit is contained in:
sabrina-shanman 2019-10-16 17:04:19 -07:00
parent 0c3e81f52f
commit acbdd2b3b5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1524,7 +1524,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
hfmModel.shapes.push_back(templateShape); hfmModel.shapes.push_back(templateShape);
auto& hfmShape = hfmModel.shapes.back(); auto& hfmShape = hfmModel.shapes.back();
// Everything else is already defined (mesh, meshPart, material), so just define the new transform // Everything else is already defined (mesh, meshPart, material), so just define the new transform
hfmShape.transform = nodeIndex; hfmShape.joint = nodeIndex;
} }
} }

2
libraries/hfm/src/hfm/HFMModelMath.cpp
View file

@ -40,7 +40,7 @@ void calculateExtentsForShape(hfm::Shape& shape, const std::vector<hfm::Mesh>& m
const auto& mesh = meshes[shape.mesh]; const auto& mesh = meshes[shape.mesh];
const auto& meshPart = mesh.parts[shape.meshPart]; const auto& meshPart = mesh.parts[shape.meshPart];
glm::mat4 globalTransform = joints[shape.transform].globalTransform; glm::mat4 globalTransform = joints[shape.joint].globalTransform;
forEachIndex(meshPart, [&](int32_t idx){ forEachIndex(meshPart, [&](int32_t idx){
if (mesh.vertices.size() <= idx) { if (mesh.vertices.size() <= idx) {
return; return;