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;
}
}
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;
}
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