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

avoid nan in Model::_scale

Browse source
This commit is contained in:
Andrew Meadows 2019-04-04 08:28:03 -07:00
parent 0d8169bd35
commit 72ac35c6f7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/Model.cpp
View file

@ -1289,6 +1289,8 @@ void Model::scaleToFit() {
// size is our "target size in world space" // size is our "target size in world space"
// we need to set our model scale so that the extents of the mesh, fit in a box that size... // we need to set our model scale so that the extents of the mesh, fit in a box that size...
glm::vec3 meshDimensions = modelMeshExtents.maximum - modelMeshExtents.minimum; glm::vec3 meshDimensions = modelMeshExtents.maximum - modelMeshExtents.minimum;
const glm::vec3 MIN_MESH_DIMENSIONS { 1.0e-6f }; // one micrometer
meshDimensions = glm::max(meshDimensions, MIN_MESH_DIMENSIONS);
glm::vec3 rescaleDimensions = _scaleToFitDimensions / meshDimensions; glm::vec3 rescaleDimensions = _scaleToFitDimensions / meshDimensions;
setScaleInternal(rescaleDimensions); setScaleInternal(rescaleDimensions);
_scaledToFit = true; _scaledToFit = true;

2
libraries/render-utils/src/Model.h
View file

@ -397,7 +397,7 @@ protected:
glm::vec3 _translation; // this is the translation in world coordinates to the model's registration point glm::vec3 _translation; // this is the translation in world coordinates to the model's registration point
glm::quat _rotation; glm::quat _rotation;
glm::vec3 _scale; glm::vec3 _scale { 1.0f };
glm::vec3 _overrideTranslation; glm::vec3 _overrideTranslation;
glm::quat _overrideRotation; glm::quat _overrideRotation;