diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp index 0c9587d3ae..0cf795e35b 100644 --- a/interface/src/LODManager.cpp +++ b/interface/src/LODManager.cpp @@ -54,6 +54,7 @@ void LODManager::setRenderTimes(float presentTime, float engineRunTime, float ba } void LODManager::autoAdjustLOD(float realTimeDelta) { + std::lock_guard { _automaticLODLock }; // The "render time" is the worse of: // - engineRunTime: Time spent in the render thread in the engine producing the gpu::Frame N @@ -235,6 +236,7 @@ void LODManager::resetLODAdjust() { } void LODManager::setAutomaticLODAdjust(bool value) { + std::lock_guard { _automaticLODLock }; _automaticLODAdjust = value; emit autoLODChanged(); } @@ -426,7 +428,6 @@ float LODManager::getWorldDetailQuality() const { return HIGH; } - void LODManager::setLODQualityLevel(float quality) { _lodQualityLevel = quality; } diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h index 77cb1a0d39..649e0e8e34 100644 --- a/interface/src/LODManager.h +++ b/interface/src/LODManager.h @@ -12,6 +12,8 @@ #ifndef hifi_LODManager_h #define hifi_LODManager_h +#include + #include #include #include @@ -47,11 +49,6 @@ class AABox; * @property {number} presentTime Read-only. * @property {number} engineRunTime Read-only. * @property {number} gpuTime Read-only. - * @property {number} avgRenderTime Read-only. - * @property {number} fps Read-only. - * @property {number} lodLevel Read-only. - * @property {number} lodDecreaseFPS Read-only. - * @property {number} lodIncreaseFPS Read-only. */ class LODManager : public QObject, public Dependency { @@ -240,6 +237,7 @@ signals: private: LODManager(); + std::mutex _automaticLODLock; bool _automaticLODAdjust = true; float _presentTime{ 0.0f }; // msec diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 50c626b594..f4f2627c66 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -531,21 +531,21 @@ function maybeUpdateOutputDeviceMutedOverlay() { var oldAutomaticLODAdjust; -var oldLODLevel; -var DEFAULT_AUTO_LOD_ADJUST = false; -var DEFAULT_LOD_LEVEL = 0.5; +var oldLODAngleDeg; +var SIMPLIFIED_UI_AUTO_LOD_ADJUST = false; +var SIMPLIFIED_UI_LOD_ANGLE_DEG = 0.5; function modifyLODSettings() { oldAutomaticLODAdjust = LODManager.automaticLODAdjust; - oldLODLevel = LODManager.lodQualityLevel; + oldLODAngleDeg = LODManager.lodAngleDeg; - LODManager.automaticLODAdjust = DEFAULT_AUTO_LOD_ADJUST; - LODManager.lodQualityLevel = DEFAULT_LOD_LEVEL; + LODManager.automaticLODAdjust = SIMPLIFIED_UI_AUTO_LOD_ADJUST; + LODManager.lodAngleDeg = SIMPLIFIED_UI_LOD_ANGLE_DEG; } function restoreLODSettings() { LODManager.automaticLODAdjust = oldAutomaticLODAdjust; - LODManager.lodQualityLevel = oldLODLevel; + LODManager.lodAngleDeg = oldLODAngleDeg; }