Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale

Case 22054: flat models can introduce nan into geometry

libraries/render-utils/src/Model.cpp

@@ -1289,6 +1289,8 @@ void Model::scaleToFit() {
     // 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...
     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;
     setScaleInternal(rescaleDimensions);
     _scaledToFit = true;

libraries/render-utils/src/Model.h

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