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

Address review comments

Browse source
This commit is contained in:
sam gateau 2018-09-14 08:43:35 -07:00
parent eccca053f9
commit b35f09fead
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/LODManager.cpp
View file

@ -46,10 +46,10 @@ const float LOD_BATCH_TO_PRESENT_CUSHION_TIME = 3.0f; // msec
void LODManager::setRenderTimes(float presentTime, float engineRunTime, float batchTime, float gpuTime) { void LODManager::setRenderTimes(float presentTime, float engineRunTime, float batchTime, float gpuTime) {
// Make sure the sampled time are positive values // Make sure the sampled time are positive values
_presentTime = std::max(0.f, presentTime); _presentTime = std::max(0.0f, presentTime);
_engineRunTime = std::max(0.f, engineRunTime); _engineRunTime = std::max(0.0f, engineRunTime);
_batchTime = std::max(0.f, batchTime); _batchTime = std::max(0.0f, batchTime);
_gpuTime = std::max(0.f, gpuTime); _gpuTime = std::max(0.0f, gpuTime);
} }
void LODManager::autoAdjustLOD(float realTimeDelta) { void LODManager::autoAdjustLOD(float realTimeDelta) {
@ -87,7 +87,7 @@ void LODManager::autoAdjustLOD(float realTimeDelta) {
_smoothRenderTime = std::max(0.0f, std::min(_smoothRenderTime, (float)MSECS_PER_SECOND)); _smoothRenderTime = std::max(0.0f, std::min(_smoothRenderTime, (float)MSECS_PER_SECOND));
// Early exit if not regulating or if the simulation or render times don't matter // Early exit if not regulating or if the simulation or render times don't matter
if (!_automaticLODAdjust || realTimeDelta <= 0.f || _nowRenderTime <= 0.0f || _smoothRenderTime <= 0.0f) { if (!_automaticLODAdjust || realTimeDelta <= 0.0f || _nowRenderTime <= 0.0f || _smoothRenderTime <= 0.0f) {
return; return;
} }
@ -144,8 +144,8 @@ void LODManager::autoAdjustLOD(float realTimeDelta) {
glm::clamp(integral, -1.0f, 1.0f); glm::clamp(integral, -1.0f, 1.0f);
// Compute derivative // Compute derivative
// if dt is never zero because realTimeDelta would have early exit above, but if it was let's zero the derivative term // dt is never zero because realTimeDelta would have early exit above, but if it ever was let's zero the derivative term
auto derivative = (dt <= 0.f ? 0.0f : (error - previous_error) / dt); auto derivative = (dt <= 0.0f ? 0.0f : (error - previous_error) / dt);
// remember history // remember history
_pidHistory.x = error; _pidHistory.x = error;