From 333eadd551a6ee7ddf91c153563fb021c7e45da8 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 4 Jan 2016 14:46:57 -0800 Subject: [PATCH 1/3] Don't show render count / distance when using acuity. --- interface/resources/qml/Stats.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml index 7048efe55c..9954cab063 100644 --- a/interface/resources/qml/Stats.qml +++ b/interface/resources/qml/Stats.qml @@ -264,7 +264,7 @@ Item { Text { color: root.fontColor; font.pixelSize: root.fontSize - visible: root.expanded + visible: root.expanded && !root.showAcuity text: root.lodStatsRenderText; } } From a37b9157bc3d680ff4de0c37a2b6382259f8f7ad Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 4 Jan 2016 15:00:54 -0800 Subject: [PATCH 2/3] simplify preferences --- interface/src/ui/PreferencesDialog.cpp | 3 ++- interface/ui/preferencesDialog.ui | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index dfdfedb50d..5cc88f123c 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -65,7 +65,8 @@ void PreferencesDialog::changeUseAcuity() { ui.desktopMinimumFPSSpin->setEnabled(useAcuity); ui.label_hmdMinimumFPSSpin->setEnabled(useAcuity); ui.hmdMinimumFPSSpin->setEnabled(useAcuity); - ui.label_smallestReasonableRenderHorizon->setText(useAcuity ? "Minimum Avatar Display Distance (@half speed)" : "Minimum Display Distance (@half speed)"); + ui.label_smallestReasonableRenderHorizon->setEnabled(!useAcuity); + ui.smallestReasonableRenderHorizon->setEnabled(!useAcuity); Menu::getInstance()->getActionForOption(MenuOption::LodTools)->setEnabled(useAcuity); Menu::getInstance()->getSubMenuFromName(MenuOption::RenderResolution, Menu::getInstance()->getSubMenuFromName("Render", Menu::getInstance()->getMenu("Developer")))->setEnabled(useAcuity); } diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui index a66c4bf7ee..06ce0bd154 100644 --- a/interface/ui/preferencesDialog.ui +++ b/interface/ui/preferencesDialog.ui @@ -974,7 +974,7 @@ - Minimum Avatar Display Distance + Minimum Display Distance 0 From 715826cc0dcc4643fb62feb73bbe95403341734e Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 4 Jan 2016 15:12:14 -0800 Subject: [PATCH 3/3] Full speed (no more half speed), and fix shouldRender for objects larger than their distance. --- interface/src/LODManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp index 10a288a44e..13bedb128a 100644 --- a/interface/src/LODManager.cpp +++ b/interface/src/LODManager.cpp @@ -250,14 +250,14 @@ int LODManager::getRenderedCount() { return lastRenderedCount; } QString LODManager::getLODStatsRenderText() { - QString label = getUseAcuity() ? "Renderable avatars: " : "Rendered objects: "; + const QString label = "Rendered objects: "; return label + QString::number(getRenderedCount()) + " w/in " + QString::number((int)getRenderDistance()) + "m"; } // compare audoAdjustLOD() void LODManager::updatePIDRenderDistance(float targetFps, float measuredFps, float deltaTime, bool isThrottled) { float distance; if (!isThrottled) { - _renderDistanceController.setMeasuredValueSetpoint(targetFps / 2.0f); // No problem updating in flight. + _renderDistanceController.setMeasuredValueSetpoint(targetFps); // No problem updating in flight. // The PID controller raises the controlled value when the measured value goes up. // The measured value is frame rate. When the controlled value (1 / render cutoff distance) // goes up, the render cutoff distance gets closer, the number of rendered avatars is less, and frame rate @@ -279,7 +279,7 @@ bool LODManager::shouldRender(const RenderArgs* args, const AABox& bounds) { if (!getUseAcuity()) { const float scenerySize = 300; // meters bool isRendered = (largestDimension > scenerySize) || // render scenery regardless of distance - (fabsf(distanceToCamera - largestDimension) < renderDistance); + (distanceToCamera < renderDistance + largestDimension); renderedCount += isRendered ? 1 : 0; return isRendered; }