From 4b5a45209ea98de30bf93be75da18b8972effd30 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 25 Jul 2019 11:06:28 -0700 Subject: [PATCH] Prefer using LODManager.lodAngleDeg for setting manual LOD --- interface/src/LODManager.h | 2 -- scripts/simplifiedUI/ui/simplifiedUI.js | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h index c0a7797561..6fd9904906 100644 --- a/interface/src/LODManager.h +++ b/interface/src/LODManager.h @@ -55,8 +55,6 @@ class LODManager : public QObject, public Dependency { Q_PROPERTY(float worldDetailQuality READ getWorldDetailQuality WRITE setWorldDetailQuality NOTIFY worldDetailQualityChanged) - Q_PROPERTY(float octreeSizeScale READ getOctreeSizeScale WRITE setOctreeSizeScale) - Q_PROPERTY(bool automaticLODAdjust READ getAutomaticLODAdjust WRITE setAutomaticLODAdjust NOTIFY autoLODChanged) Q_PROPERTY(float presentTime READ getPresentTime) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index e9f49587aa..3cbdadf47d 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -531,21 +531,21 @@ function maybeUpdateOutputDeviceMutedOverlay() { var oldAutomaticLODAdjust; -var oldOctreeSizeScale; +var oldLODAngleDeg; var SIMPLIFIED_UI_AUTO_LOD_ADJUST = false; -var SIMPLIFIED_UI_OCTREE_SIZE_SCALE = 32768 * 916; // Octree cell size in meters (constant) * distance in meters at which we want a 1 meter cube to be visible +var SIMPLIFIED_UI_LOD_ANGLE_DEG = 1.0 function modifyLODSettings() { oldAutomaticLODAdjust = LODManager.automaticLODAdjust; - oldOctreeSizeScale = LODManager.octreeSizeScale; + oldLODAngleDeg = LODManager.lodAngleDeg; LODManager.automaticLODAdjust = SIMPLIFIED_UI_AUTO_LOD_ADJUST; - LODManager.octreeSizeScale = SIMPLIFIED_UI_OCTREE_SIZE_SCALE; + LODManager.lodAngleDeg = SIMPLIFIED_UI_LOD_ANGLE_DEG; } function restoreLODSettings() { LODManager.automaticLODAdjust = oldAutomaticLODAdjust; - LODManager.octreeSizeScale = oldOctreeSizeScale; + LODManager.lodAngleDeg = oldLODAngleDeg; }