Prefer using LODManager.lodAngleDeg for setting manual LOD

This commit is contained in:
sabrina-shanman 2019-07-25 11:06:28 -07:00
parent 3a4ce44633
commit 4b5a45209e
2 changed files with 5 additions and 7 deletions

View file

@ -55,8 +55,6 @@ class LODManager : public QObject, public Dependency {
Q_PROPERTY(float worldDetailQuality READ getWorldDetailQuality WRITE setWorldDetailQuality NOTIFY worldDetailQualityChanged) 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(bool automaticLODAdjust READ getAutomaticLODAdjust WRITE setAutomaticLODAdjust NOTIFY autoLODChanged)
Q_PROPERTY(float presentTime READ getPresentTime) Q_PROPERTY(float presentTime READ getPresentTime)

View file

@ -531,21 +531,21 @@ function maybeUpdateOutputDeviceMutedOverlay() {
var oldAutomaticLODAdjust; var oldAutomaticLODAdjust;
var oldOctreeSizeScale; var oldLODAngleDeg;
var SIMPLIFIED_UI_AUTO_LOD_ADJUST = false; 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() { function modifyLODSettings() {
oldAutomaticLODAdjust = LODManager.automaticLODAdjust; oldAutomaticLODAdjust = LODManager.automaticLODAdjust;
oldOctreeSizeScale = LODManager.octreeSizeScale; oldLODAngleDeg = LODManager.lodAngleDeg;
LODManager.automaticLODAdjust = SIMPLIFIED_UI_AUTO_LOD_ADJUST; LODManager.automaticLODAdjust = SIMPLIFIED_UI_AUTO_LOD_ADJUST;
LODManager.octreeSizeScale = SIMPLIFIED_UI_OCTREE_SIZE_SCALE; LODManager.lodAngleDeg = SIMPLIFIED_UI_LOD_ANGLE_DEG;
} }
function restoreLODSettings() { function restoreLODSettings() {
LODManager.automaticLODAdjust = oldAutomaticLODAdjust; LODManager.automaticLODAdjust = oldAutomaticLODAdjust;
LODManager.octreeSizeScale = oldOctreeSizeScale; LODManager.lodAngleDeg = oldLODAngleDeg;
} }