From 9d93a2f502b2004635987914dcac7aef85300c8e Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 24 Jul 2019 16:27:24 -0700
Subject: [PATCH] Fix simplifiedUI stuck on wrong LOD value
---
interface/src/LODManager.h | 8 ++++++++
scripts/simplifiedUI/ui/simplifiedUI.js | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h
index 77cb1a0d39..94e5ae2a3c 100644
--- a/interface/src/LODManager.h
+++ b/interface/src/LODManager.h
@@ -62,6 +62,8 @@ class LODManager : public QObject, public Dependency {
Q_PROPERTY(float lodQualityLevel READ getLODQualityLevel WRITE setLODQualityLevel NOTIFY lodQualityLevelChanged)
+ Q_PROPERTY(float octreeSizeScale READ getOctreeSizeScale WRITE setOctreeSizeScale)
+
Q_PROPERTY(bool automaticLODAdjust READ getAutomaticLODAdjust WRITE setAutomaticLODAdjust NOTIFY autoLODChanged)
Q_PROPERTY(float presentTime READ getPresentTime)
@@ -150,6 +152,12 @@ public:
*/
Q_INVOKABLE float getOctreeSizeScale() const { return _octreeSizeScale; }
+ /**jsdoc
+ * @function LODManager.getDefaultOctreeSizeScale
+ * @param {number} sizeScale
+ */
+ Q_INVOKABLE float getDefaultOctreeSizeScale() const { return DEFAULT_OCTREE_SIZE_SCALE; }
+
/**jsdoc
* @function LODManager.setBoundaryLevelAdjust
* @param {number} boundaryLevelAdjust
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 50c626b594..80c0a6a61d 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -531,21 +531,21 @@ function maybeUpdateOutputDeviceMutedOverlay() {
var oldAutomaticLODAdjust;
-var oldLODLevel;
+var oldOctreeSizeScale;
var DEFAULT_AUTO_LOD_ADJUST = false;
-var DEFAULT_LOD_LEVEL = 0.5;
+var DEFAULT_OCTREE_SIZE_SCALE = LODManager.getDefaultOctreeSizeScale();
function modifyLODSettings() {
oldAutomaticLODAdjust = LODManager.automaticLODAdjust;
- oldLODLevel = LODManager.lodQualityLevel;
+ oldOctreeSizeScale = LODManager.octreeSizeScale;
LODManager.automaticLODAdjust = DEFAULT_AUTO_LOD_ADJUST;
- LODManager.lodQualityLevel = DEFAULT_LOD_LEVEL;
+ LODManager.octreeSizeScale = DEFAULT_OCTREE_SIZE_SCALE;
}
function restoreLODSettings() {
LODManager.automaticLODAdjust = oldAutomaticLODAdjust;
- LODManager.lodQualityLevel = oldLODLevel;
+ LODManager.octreeSizeScale = oldOctreeSizeScale;
}