Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:10:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

also consider GPU render time for LOD adjust

Browse source
This commit is contained in:
Andrew Meadows 2017-12-19 16:43:49 -08:00
parent 9c4a0c8c70
commit 4fb9680f3b
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -4325,7 +4325,9 @@ void Application::updateLOD(float deltaTime) const {
if (!isThrottleRendering()) { if (!isThrottleRendering()) {
float presentTime = getActiveDisplayPlugin()->getAveragePresentTime(); float presentTime = getActiveDisplayPlugin()->getAveragePresentTime();
float engineRunTime = (float)(_renderEngine->getConfiguration().get()->getCPURunTime()); float engineRunTime = (float)(_renderEngine->getConfiguration().get()->getCPURunTime());
DependencyManager::get<LODManager>()->autoAdjustLOD(presentTime, engineRunTime, deltaTime); float gpuTime = getGPUContext()->getFrameTimerGPUAverage();
float maxRenderTime = glm::max(gpuTime, glm::max(presentTime, engineRunTime));
DependencyManager::get<LODManager>()->autoAdjustLOD(maxRenderTime, deltaTime);
} else { } else {
DependencyManager::get<LODManager>()->resetLODAdjust(); DependencyManager::get<LODManager>()->resetLODAdjust();
} }

5
interface/src/LODManager.cpp
View file

@ -44,12 +44,11 @@ float LODManager::getLODIncreaseFPS() {
return getDesktopLODIncreaseFPS(); return getDesktopLODIncreaseFPS();
} }
void LODManager::autoAdjustLOD(float presentTime, float engineRunTime, float deltaTimeSec) { void LODManager::autoAdjustLOD(float renderTime, float deltaTimeSec) {
// compute time-weighted running average renderTime // compute time-weighted running average renderTime
float maxTime = glm::max(presentTime, engineRunTime);
const float LOD_ADJUST_TIMESCALE = 0.1f; // sec const float LOD_ADJUST_TIMESCALE = 0.1f; // sec
float blend = (deltaTimeSec < LOD_ADJUST_TIMESCALE) ? deltaTimeSec / LOD_ADJUST_TIMESCALE : 1.0f; float blend = (deltaTimeSec < LOD_ADJUST_TIMESCALE) ? deltaTimeSec / LOD_ADJUST_TIMESCALE : 1.0f;
_avgRenderTime = (1.0f - blend) * _avgRenderTime + blend * maxTime; // msec _avgRenderTime = (1.0f - blend) * _avgRenderTime + blend * renderTime; // msec
if (!_automaticLODAdjust) { if (!_automaticLODAdjust) {
// early exit // early exit
return; return;

2
interface/src/LODManager.h
View file

@ -62,7 +62,7 @@ public:
Q_INVOKABLE float getLODIncreaseFPS(); Q_INVOKABLE float getLODIncreaseFPS();
static bool shouldRender(const RenderArgs* args, const AABox& bounds); static bool shouldRender(const RenderArgs* args, const AABox& bounds);
void autoAdjustLOD(float presentTime, float engineRunTime, float deltaTimeSec); void autoAdjustLOD(float renderTime, float deltaTimeSec);
void loadSettings(); void loadSettings();
void saveSettings(); void saveSettings();