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

remove unnecessary whitespace

Browse source
This commit is contained in:
Andrew Meadows 2017-12-18 13:56:20 -08:00
parent aad89e87be
commit 7a9d566e02
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
interface/src/LODManager.cpp
View file

@ -64,11 +64,11 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
// translate into fps for legacy implementation // translate into fps for legacy implementation
float currentFPS = (float)MSECS_PER_SECOND / _avgRenderTime; float currentFPS = (float)MSECS_PER_SECOND / _avgRenderTime;
_fpsAverageStartWindow.updateAverage(currentFPS); _fpsAverageStartWindow.updateAverage(currentFPS);
_fpsAverageDownWindow.updateAverage(currentFPS); _fpsAverageDownWindow.updateAverage(currentFPS);
_fpsAverageUpWindow.updateAverage(currentFPS); _fpsAverageUpWindow.updateAverage(currentFPS);
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
quint64 elapsedSinceDownShift = now - _lastDownShift; quint64 elapsedSinceDownShift = now - _lastDownShift;
@ -76,22 +76,22 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
quint64 lastStableOrUpshift = glm::max(_lastUpShift, _lastStable); quint64 lastStableOrUpshift = glm::max(_lastUpShift, _lastStable);
quint64 elapsedSinceStableOrUpShift = now - lastStableOrUpshift; quint64 elapsedSinceStableOrUpShift = now - lastStableOrUpshift;
if (_automaticLODAdjust) { if (_automaticLODAdjust) {
bool changed = false; bool changed = false;
// LOD Downward adjustment // LOD Downward adjustment
// If we've been downshifting, we watch a shorter downshift window so that we will quickly move toward our // If we've been downshifting, we watch a shorter downshift window so that we will quickly move toward our
// target frame rate. But if we haven't just done a downshift (either because our last shift was an upshift, // target frame rate. But if we haven't just done a downshift (either because our last shift was an upshift,
// or because we've just started out) then we look at a much longer window to consider whether or not to start // or because we've just started out) then we look at a much longer window to consider whether or not to start
// downshifting. // downshifting.
bool doDownShift = false; bool doDownShift = false;
if (_isDownshifting) { if (_isDownshifting) {
// only consider things if our DOWN_SHIFT time has elapsed... // only consider things if our DOWN_SHIFT time has elapsed...
if (elapsedSinceDownShift > DOWN_SHIFT_ELPASED) { if (elapsedSinceDownShift > DOWN_SHIFT_ELPASED) {
doDownShift = _fpsAverageDownWindow.getAverage() < getLODDecreaseFPS(); doDownShift = _fpsAverageDownWindow.getAverage() < getLODDecreaseFPS();
if (!doDownShift) { if (!doDownShift) {
qCDebug(interfaceapp) << "---- WE APPEAR TO BE DONE DOWN SHIFTING -----"; qCDebug(interfaceapp) << "---- WE APPEAR TO BE DONE DOWN SHIFTING -----";
_isDownshifting = false; _isDownshifting = false;
@ -99,10 +99,10 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
} }
} }
} else { } else {
doDownShift = (elapsedSinceStableOrUpShift > START_SHIFT_ELPASED doDownShift = (elapsedSinceStableOrUpShift > START_SHIFT_ELPASED
&& _fpsAverageStartWindow.getAverage() < getLODDecreaseFPS()); && _fpsAverageStartWindow.getAverage() < getLODDecreaseFPS());
} }
if (doDownShift) { if (doDownShift) {
// Octree items... stepwise adjustment // Octree items... stepwise adjustment
@ -118,17 +118,17 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
if (_isDownshifting) { if (_isDownshifting) {
// subsequent downshift // subsequent downshift
qCDebug(interfaceapp) << "adjusting LOD DOWN..." qCDebug(interfaceapp) << "adjusting LOD DOWN..."
<< "average fps for last "<< DOWN_SHIFT_WINDOW_IN_SECS <<"seconds was " << "average fps for last "<< DOWN_SHIFT_WINDOW_IN_SECS <<"seconds was "
<< _fpsAverageDownWindow.getAverage() << _fpsAverageDownWindow.getAverage()
<< "minimum is:" << getLODDecreaseFPS() << "minimum is:" << getLODDecreaseFPS()
<< "elapsedSinceDownShift:" << elapsedSinceDownShift << "elapsedSinceDownShift:" << elapsedSinceDownShift
<< " NEW _octreeSizeScale=" << _octreeSizeScale; << " NEW _octreeSizeScale=" << _octreeSizeScale;
} else { } else {
// first downshift // first downshift
qCDebug(interfaceapp) << "adjusting LOD DOWN after initial delay..." qCDebug(interfaceapp) << "adjusting LOD DOWN after initial delay..."
<< "average fps for last "<< START_DELAY_WINDOW_IN_SECS <<"seconds was " << "average fps for last "<< START_DELAY_WINDOW_IN_SECS <<"seconds was "
<< _fpsAverageStartWindow.getAverage() << _fpsAverageStartWindow.getAverage()
<< "minimum is:" << getLODDecreaseFPS() << "minimum is:" << getLODDecreaseFPS()
<< "elapsedSinceUpShift:" << elapsedSinceUpShift << "elapsedSinceUpShift:" << elapsedSinceUpShift
<< " NEW _octreeSizeScale=" << _octreeSizeScale; << " NEW _octreeSizeScale=" << _octreeSizeScale;
} }
@ -139,10 +139,10 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
emit LODDecreased(); emit LODDecreased();
} }
} else { } else {
// LOD Upward adjustment // LOD Upward adjustment
if (elapsedSinceUpShift > UP_SHIFT_ELPASED) { if (elapsedSinceUpShift > UP_SHIFT_ELPASED) {
if (_fpsAverageUpWindow.getAverage() > getLODIncreaseFPS()) { if (_fpsAverageUpWindow.getAverage() > getLODIncreaseFPS()) {
// Octee items... stepwise adjustment // Octee items... stepwise adjustment
@ -158,11 +158,11 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
changed = true; changed = true;
} }
} }
if (changed) { if (changed) {
qCDebug(interfaceapp) << "adjusting LOD UP... average fps for last "<< UP_SHIFT_WINDOW_IN_SECS <<"seconds was " qCDebug(interfaceapp) << "adjusting LOD UP... average fps for last "<< UP_SHIFT_WINDOW_IN_SECS <<"seconds was "
<< _fpsAverageUpWindow.getAverage() << _fpsAverageUpWindow.getAverage()
<< "upshift point is:" << getLODIncreaseFPS() << "upshift point is:" << getLODIncreaseFPS()
<< "elapsedSinceUpShift:" << elapsedSinceUpShift << "elapsedSinceUpShift:" << elapsedSinceUpShift
<< " NEW _octreeSizeScale=" << _octreeSizeScale; << " NEW _octreeSizeScale=" << _octreeSizeScale;
@ -173,7 +173,7 @@ void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float delta
} }
} }
} }
if (changed) { if (changed) {
auto lodToolsDialog = DependencyManager::get<DialogsManager>()->getLodToolsDialog(); auto lodToolsDialog = DependencyManager::get<DialogsManager>()->getLodToolsDialog();
if (lodToolsDialog) { if (lodToolsDialog) {