From 4844f06e5e172e6b2e1b61f694145d5f5dbe649b Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 29 Aug 2018 17:33:39 -0700 Subject: [PATCH] brain freeze --- interface/src/LODManager.cpp | 4 +--- scripts/developer/utilities/lib/plotperf/PlotPerf.qml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp index ce674f7295..df371f3a59 100644 --- a/interface/src/LODManager.cpp +++ b/interface/src/LODManager.cpp @@ -105,9 +105,7 @@ void LODManager::autoAdjustLOD(float realTimeDelta) { auto error = (targetFPS - currentFPS) / targetFPS; error = glm::clamp(error, -1.0f, 1.0f); - if (error <= 0.0f) { - // error = error * 2.0f; - } + auto integral = previous_integral + error * dt; glm::clamp(integral, -1.0f, 1.0f); diff --git a/scripts/developer/utilities/lib/plotperf/PlotPerf.qml b/scripts/developer/utilities/lib/plotperf/PlotPerf.qml index 46056be5fd..27101a2867 100644 --- a/scripts/developer/utilities/lib/plotperf/PlotPerf.qml +++ b/scripts/developer/utilities/lib/plotperf/PlotPerf.qml @@ -186,10 +186,10 @@ Item { } function pixelFromVal(val, valScale) { - return lineHeight + (height - lineHeight) * (1 - (0.9) * (val - _displayMinValue) / (_displayMaxValue - _displayMinValue)); + return lineHeight + (height - lineHeight) * (1 - (0.99) * (val - _displayMinValue) / (_displayMaxValue - _displayMinValue)); } function valueFromPixel(pixY) { - return _displayMinValue + (((pixY - lineHeight) / (height - lineHeight) - 1) * (_displayMaxValue - _displayMinValue) / (-0.9)); + return _displayMinValue + (((pixY - lineHeight) / (height - lineHeight) - 1) * (_displayMaxValue - _displayMinValue) / (-0.99)); } function plotValueHistory(ctx, valHistory, color) { var widthStep= width / (valHistory.length - 1);