Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 13:49:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rare case where script would fail to set LOD after disabling auto LOD

Browse source
This commit is contained in:
sabrina-shanman 2019-07-25 11:33:19 -07:00
parent 4b5a45209e
commit 94e725dc2a
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/LODManager.cpp
View file

@ -54,6 +54,7 @@ void LODManager::setRenderTimes(float presentTime, float engineRunTime, float ba
} }
void LODManager::autoAdjustLOD(float realTimeDelta) { void LODManager::autoAdjustLOD(float realTimeDelta) {
std::lock_guard<std::mutex> { _automaticLODLock };
// The "render time" is the worse of: // The "render time" is the worse of:
// - engineRunTime: Time spent in the render thread in the engine producing the gpu::Frame N // - 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) { void LODManager::setAutomaticLODAdjust(bool value) {
std::lock_guard<std::mutex> { _automaticLODLock };
_automaticLODAdjust = value; _automaticLODAdjust = value;
emit autoLODChanged(); emit autoLODChanged();
} }

3
interface/src/LODManager.h
View file

@ -12,6 +12,8 @@
#ifndef hifi_LODManager_h #ifndef hifi_LODManager_h
#define hifi_LODManager_h #define hifi_LODManager_h
#include <mutex>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <NumericalConstants.h> #include <NumericalConstants.h>
#include <OctreeConstants.h> #include <OctreeConstants.h>
@ -230,6 +232,7 @@ signals:
private: private:
LODManager(); LODManager();
std::mutex _automaticLODLock;
bool _automaticLODAdjust = true; bool _automaticLODAdjust = true;
float _presentTime{ 0.0f }; // msec float _presentTime{ 0.0f }; // msec