From 069199554ccee24f98fcbc8229dc6e67e124c069 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 15 Dec 2015 16:07:37 -0800
Subject: [PATCH 01/10] checkpoint

---
 interface/src/Application.cpp          |  6 ++-
 interface/src/LODManager.cpp           | 66 ++++++++++++++++++++++++--
 interface/src/LODManager.h             | 22 +++++++++
 interface/src/ui/PreferencesDialog.cpp | 17 ++++++-
 interface/src/ui/PreferencesDialog.h   |  1 +
 interface/src/ui/Stats.cpp             |  4 +-
 interface/ui/preferencesDialog.ui      | 45 ++++++++++++++++--
 7 files changed, 148 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4494203a49..97bc3f3689 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2801,7 +2801,11 @@ void Application::update(float deltaTime) {
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::update()");
 
-    updateLOD();
+    if (DependencyManager::get<LODManager>()->getUseAcuity()) {
+        updateLOD();
+    } else {
+        DependencyManager::get<LODManager>()->updatePIDRenderDistance(getTargetFrameRate(), getLastInstanteousFps(), deltaTime, isThrottleRendering());
+    }
 
     {
         PerformanceTimer perfTimer("devices");
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 368143e36e..dfe03137d5 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -20,9 +20,25 @@
 
 Setting::Handle<float> desktopLODDecreaseFPS("desktopLODDecreaseFPS", DEFAULT_DESKTOP_LOD_DOWN_FPS);
 Setting::Handle<float> hmdLODDecreaseFPS("hmdLODDecreaseFPS", DEFAULT_HMD_LOD_DOWN_FPS);
+// There are two different systems in use, based on lodPreference:
+// pid: renderDistance is automatically adjusted such that frame rate targets are met.
+// acuity:  a pseudo-acuity target is held, or adjusted to match minimum frame rates.
+// If unspecified, acuity is used only if user has specified non-default minumum frame rates.
+Setting::Handle<int> lodPreference("lodPreference", (int)LODManager::LODPreference::unspecified);
 
 LODManager::LODManager() {
     calculateAvatarLODDistanceMultiplier();
+
+    _renderDistanceController.setControlledValueHighLimit(20.0f);
+    _renderDistanceController.setControlledValueLowLimit(1.0f / (float)TREE_SCALE);
+    // Advice for tuning parameters:
+    // See PIDController.h. There's a section on tuning in the reference.
+    // Turn on logging with the following (or from js with AvatarList.setRenderDistanceControllerHistory("avatar render", 300))
+    //_renderDistanceController.setHistorySize("avatar render", target_fps * 4);
+    // Note that extra logging/hysteresis is turned off in Avatar.cpp when the above logging is on.
+    _renderDistanceController.setKP(0.000012f); // Usually about 0.6 of largest that doesn't oscillate when other parameters 0.
+    _renderDistanceController.setKI(0.00002f); // Big enough to bring us to target with the above KP.
+    _renderDistanceController.setHistorySize("FIXME", 240);
 }
 
 float LODManager::getLODDecreaseFPS() {
@@ -39,7 +55,6 @@ float LODManager::getLODIncreaseFPS() {
     return getDesktopLODIncreaseFPS();
 }
 
-
 void LODManager::autoAdjustLOD(float currentFPS) {
     
     // NOTE: our first ~100 samples at app startup are completely all over the place, and we don't
@@ -217,15 +232,53 @@ QString LODManager::getLODFeedbackText() {
     return result;
 }
 
+static float renderDistance = (float)TREE_SCALE;
+static int renderedCount = 0;
+static int lastRenderedCount = 0;
+bool LODManager::getUseAcuity() { return lodPreference.get() == (int)LODManager::LODPreference::acuity; }
+void LODManager::setUseAcuity(bool newValue) { lodPreference.set(newValue ? (int)LODManager::LODPreference::acuity : (int)LODManager::LODPreference::pid); }
+float LODManager::getRenderDistance() {
+    return renderDistance;
+}
+int LODManager::getRenderedCount() {
+    return lastRenderedCount;
+}
+// compare audoAdjustLOD()
+void LODManager::updatePIDRenderDistance(float targetFps, float measuredFps, float deltaTime, bool isThrottled) {
+    float distance;
+    if (!isThrottled) {
+        _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
+        // goes up.
+        distance = 1.0f / _renderDistanceController.update(measuredFps, deltaTime);
+    }
+    else {
+        // Here we choose to just use the maximum render cutoff distance if throttled.
+        distance = 1.0f / _renderDistanceController.getControlledValueLowLimit();
+    }
+    _renderDistanceAverage.updateAverage(distance);
+    renderDistance = _renderDistanceAverage.getAverage(); // average only once per cycle
+    lastRenderedCount = renderedCount;
+    renderedCount = 0;
+}
+
 bool LODManager::shouldRender(const RenderArgs* args, const AABox& bounds) {
+    float distanceToCamera = glm::length(bounds.calcCenter() - args->_viewFrustum->getPosition());
+    float largestDimension = bounds.getLargestDimension();
+    if (!getUseAcuity()) {
+        bool isRendered = fabsf(distanceToCamera - largestDimension) < renderDistance;
+        renderedCount += isRendered ? 1 : 0;
+        return isRendered;
+    }
+
     const float maxScale = (float)TREE_SCALE;
     const float octreeToMeshRatio = 4.0f; // must be this many times closer to a mesh than a voxel to see it.
     float octreeSizeScale = args->_sizeScale;
     int boundaryLevelAdjust = args->_boundaryLevelAdjust;
     float visibleDistanceAtMaxScale = boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale) / octreeToMeshRatio;
-    float distanceToCamera = glm::length(bounds.calcCenter() - args->_viewFrustum->getPosition());
-    float largestDimension = bounds.getLargestDimension();
-    
+
     static bool shouldRenderTableNeedsBuilding = true;
     static QMap<float, float> shouldRenderTable;
     if (shouldRenderTableNeedsBuilding) {
@@ -315,6 +368,11 @@ void LODManager::setBoundaryLevelAdjust(int boundaryLevelAdjust) {
 void LODManager::loadSettings() {
     setDesktopLODDecreaseFPS(desktopLODDecreaseFPS.get());
     setHMDLODDecreaseFPS(hmdLODDecreaseFPS.get());
+
+    if (lodPreference.get() == (int)LODManager::LODPreference::unspecified) {
+        setUseAcuity((getDesktopLODDecreaseFPS() != DEFAULT_DESKTOP_LOD_DOWN_FPS) || (getHMDLODDecreaseFPS() != DEFAULT_HMD_LOD_DOWN_FPS));
+    }
+    Menu::getInstance()->getActionForOption(MenuOption::LodTools)->setEnabled(getUseAcuity());
 }
 
 void LODManager::saveSettings() {
diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h
index b0185b528f..21a30bceaf 100644
--- a/interface/src/LODManager.h
+++ b/interface/src/LODManager.h
@@ -15,6 +15,7 @@
 #include <DependencyManager.h>
 #include <NumericalConstants.h>
 #include <OctreeConstants.h>
+#include <PIDController.h>
 #include <SimpleMovingAverage.h>
 
 const float DEFAULT_DESKTOP_LOD_DOWN_FPS = 15.0;
@@ -81,6 +82,24 @@ public:
     Q_INVOKABLE float getLODDecreaseFPS();
     Q_INVOKABLE float getLODIncreaseFPS();
     
+    enum class LODPreference {
+        pid = 0,
+        acuity,
+        unspecified
+    };
+    static bool getUseAcuity();
+    static void setUseAcuity(bool newValue);
+    Q_INVOKABLE bool getRenderDistanceControllerIsLogging() { return _renderDistanceController.getIsLogging(); }
+    Q_INVOKABLE void setRenderDistanceControllerHistory(QString label, int size) { return _renderDistanceController.setHistorySize(label, size); }
+    Q_INVOKABLE void setRenderDistanceKP(float newValue) { _renderDistanceController.setKP(newValue); }
+    Q_INVOKABLE void setRenderDistanceKI(float newValue) { _renderDistanceController.setKI(newValue); }
+    Q_INVOKABLE void setRenderDistanceKD(float newValue) { _renderDistanceController.setKD(newValue); }
+    Q_INVOKABLE void setRenderDistanceInverseLowLimit(float newValue) { _renderDistanceController.setControlledValueLowLimit(newValue); }
+    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue) { _renderDistanceController.setControlledValueHighLimit(newValue); }
+    void updatePIDRenderDistance(float targetFps, float measuredFps, float deltaTime, bool isThrottled);
+    float getRenderDistance();
+    int getRenderedCount();
+
     static bool shouldRender(const RenderArgs* args, const AABox& bounds);
     bool shouldRenderMesh(float largestDimension, float distanceToCamera);
     void autoAdjustLOD(float currentFPS);
@@ -116,6 +135,9 @@ private:
     
     bool _shouldRenderTableNeedsRebuilding = true;
     QMap<float, float> _shouldRenderTable;
+
+    PIDController _renderDistanceController{};
+    SimpleMovingAverage _renderDistanceAverage{ 10 };
 };
 
 #endif // hifi_LODManager_h
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 9a995263cd..bc08391bbe 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -48,6 +48,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
 
     connect(ui.buttonChangeAppearance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser);
     connect(ui.appearanceDescription, &QLineEdit::editingFinished, this, &PreferencesDialog::changeFullAvatarURL);
+    connect(ui.useAcuityCheckBox, &QCheckBox::clicked, this, &PreferencesDialog::changeUseAcuity);
 
     connect(qApp, &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
 
@@ -58,6 +59,15 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
     UIUtil::scaleWidgetFontSizes(this);
 }
 
+void PreferencesDialog::changeUseAcuity() {
+    bool useAcuity = ui.useAcuityCheckBox->isChecked();
+    ui.label_desktopMinimumFPSSpin->setEnabled(useAcuity);
+    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)");
+    Menu::getInstance()->getActionForOption(MenuOption::LodTools)->setEnabled(useAcuity);
+}
 void PreferencesDialog::changeFullAvatarURL() {
     DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(ui.appearanceDescription->text(), "");
     this->fullAvatarURLChanged(ui.appearanceDescription->text(), "");
@@ -212,9 +222,11 @@ void PreferencesDialog::loadPreferences() {
 
     // LOD items
     auto lodManager = DependencyManager::get<LODManager>();
+    ui.useAcuityCheckBox->setChecked(lodManager->getUseAcuity());
     ui.desktopMinimumFPSSpin->setValue(lodManager->getDesktopLODDecreaseFPS());
     ui.hmdMinimumFPSSpin->setValue(lodManager->getHMDLODDecreaseFPS());
-    ui.avatarRenderSmallestReasonableHorizon->setValue(1.0f / DependencyManager::get<AvatarManager>()->getRenderDistanceInverseHighLimit());
+    ui.smallestReasonableRenderHorizon->setValue(1.0f / DependencyManager::get<AvatarManager>()->getRenderDistanceInverseHighLimit());
+    changeUseAcuity();
 }
 
 void PreferencesDialog::savePreferences() {
@@ -303,7 +315,8 @@ void PreferencesDialog::savePreferences() {
 
     // LOD items
     auto lodManager = DependencyManager::get<LODManager>();
+    lodManager->setUseAcuity(ui.useAcuityCheckBox->isChecked());
     lodManager->setDesktopLODDecreaseFPS(ui.desktopMinimumFPSSpin->value());
     lodManager->setHMDLODDecreaseFPS(ui.hmdMinimumFPSSpin->value());
-    DependencyManager::get<AvatarManager>()->setRenderDistanceInverseHighLimit(1.0f / ui.avatarRenderSmallestReasonableHorizon->value());
+    DependencyManager::get<AvatarManager>()->setRenderDistanceInverseHighLimit(1.0f / ui.smallestReasonableRenderHorizon->value());
 }
diff --git a/interface/src/ui/PreferencesDialog.h b/interface/src/ui/PreferencesDialog.h
index 1536eca3ee..a6c27dee08 100644
--- a/interface/src/ui/PreferencesDialog.h
+++ b/interface/src/ui/PreferencesDialog.h
@@ -51,6 +51,7 @@ private slots:
     void openScriptsLocationBrowser();
     void changeFullAvatarURL();
     void fullAvatarURLChanged(const QString& newValue, const QString& modelName);
+    void changeUseAcuity();
 };
 
 #endif // hifi_PreferencesDialog_h
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 6acacee41d..e391d5c40a 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -116,8 +116,8 @@ void Stats::updateStats(bool force) {
     auto avatarManager = DependencyManager::get<AvatarManager>();
     // we need to take one avatar out so we don't include ourselves
     STAT_UPDATE(avatarCount, avatarManager->size() - 1);
-    STAT_UPDATE(avatarRenderableCount, avatarManager->getNumberInRenderRange());
-    STAT_UPDATE(avatarRenderDistance, (int) round(avatarManager->getRenderDistance())); // deliberately truncating
+    STAT_UPDATE(avatarRenderableCount, DependencyManager::get<LODManager>()->getRenderedCount()); //FIXME avatarManager->getNumberInRenderRange());
+    STAT_UPDATE(avatarRenderDistance, (int)round(DependencyManager::get<LODManager>()->getRenderDistance())); // FIXME avatarManager->getRenderDistance())); // deliberately truncating
     STAT_UPDATE(serverCount, (int)nodeList->size());
     STAT_UPDATE(renderrate, (int)qApp->getFps());
     if (qApp->getActiveDisplayPlugin()) {
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index e6a5e2228d..a66c4bf7ee 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -742,6 +742,43 @@
         </widget>
        </item>
 
+        <item>
+          <widget class="QCheckBox" name="useAcuityCheckBox">
+            <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+              </sizepolicy>
+            </property>
+            <property name="minimumSize">
+              <size>
+                <width>32</width>
+                <height>28</height>
+              </size>
+            </property>
+            <property name="baseSize">
+              <size>
+                <width>0</width>
+                <height>0</height>
+              </size>
+            </property>
+            <property name="font">
+              <font>
+                <family>Arial</family>
+              </font>
+            </property>
+            <property name="text">
+              <string>Render based on visual acuity</string>
+            </property>
+            <property name="iconSize">
+              <size>
+                <width>0</width>
+                <height>0</height>
+              </size>
+            </property>
+          </widget>
+        </item>
+
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_111x">
          <property name="spacing">
@@ -757,7 +794,7 @@
           <number>7</number>
          </property>
          <item>
-          <widget class="QLabel" name="label_9x">
+          <widget class="QLabel" name="label_desktopMinimumFPSSpin">
            <property name="font">
             <font>
              <family>Arial</family>
@@ -842,7 +879,7 @@
           <number>7</number>
          </property>
          <item>
-          <widget class="QLabel" name="label_9y">
+          <widget class="QLabel" name="label_hmdMinimumFPSSpin">
            <property name="font">
             <font>
              <family>Arial</family>
@@ -927,7 +964,7 @@
           <number>7</number>
          </property>
          <item>
-          <widget class="QLabel" name="label_9yz">
+          <widget class="QLabel" name="label_smallestReasonableRenderHorizon">
            <property name="font">
             <font>
              <family>Arial</family>
@@ -963,7 +1000,7 @@
           </spacer>
          </item>
          <item>
-          <widget class="QSpinBox" name="avatarRenderSmallestReasonableHorizon">
+          <widget class="QSpinBox" name="smallestReasonableRenderHorizon">
            <property name="minimumSize">
             <size>
              <width>100</width>

From f47873bac3b581609a88e73b322f20051b1a8d52 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 15 Dec 2015 17:00:49 -0800
Subject: [PATCH 02/10] stats checkpoint

---
 interface/src/LODManager.cpp | 2 +-
 interface/src/ui/Stats.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index dfe03137d5..5ac2f687c7 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -247,7 +247,7 @@ int LODManager::getRenderedCount() {
 void LODManager::updatePIDRenderDistance(float targetFps, float measuredFps, float deltaTime, bool isThrottled) {
     float distance;
     if (!isThrottled) {
-        _renderDistanceController.setMeasuredValueSetpoint(targetFps); // No problem updating in flight.
+        _renderDistanceController.setMeasuredValueSetpoint(targetFps / 2.0f); // 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
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index e391d5c40a..a86ed97f0c 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -116,8 +116,6 @@ void Stats::updateStats(bool force) {
     auto avatarManager = DependencyManager::get<AvatarManager>();
     // we need to take one avatar out so we don't include ourselves
     STAT_UPDATE(avatarCount, avatarManager->size() - 1);
-    STAT_UPDATE(avatarRenderableCount, DependencyManager::get<LODManager>()->getRenderedCount()); //FIXME avatarManager->getNumberInRenderRange());
-    STAT_UPDATE(avatarRenderDistance, (int)round(DependencyManager::get<LODManager>()->getRenderDistance())); // FIXME avatarManager->getRenderDistance())); // deliberately truncating
     STAT_UPDATE(serverCount, (int)nodeList->size());
     STAT_UPDATE(renderrate, (int)qApp->getFps());
     if (qApp->getActiveDisplayPlugin()) {
@@ -285,6 +283,8 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(localLeaves, (int)OctreeElement::getLeafNodeCount());
         // LOD Details
         STAT_UPDATE(lodStatus, "You can see " + DependencyManager::get<LODManager>()->getLODFeedbackText());
+        STAT_UPDATE(avatarRenderableCount, DependencyManager::get<LODManager>()->getRenderedCount()); //FIXME avatarManager->getNumberInRenderRange());
+        STAT_UPDATE(avatarRenderDistance, (int)round(DependencyManager::get<LODManager>()->getRenderDistance())); // FIXME avatarManager->getRenderDistance())); // deliberately truncating
     }
 
     bool performanceTimerIsActive = PerformanceTimer::isActive();

From 09d4a06ad4dbe8c1adbe093d66757efcb475fbe4 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Wed, 16 Dec 2015 15:30:48 -0800
Subject: [PATCH 03/10] LODManager-centric stats and preferences.

---
 interface/resources/qml/Stats.qml      |  4 ++--
 interface/src/LODManager.cpp           | 30 ++++++++++++++++++++------
 interface/src/LODManager.h             |  9 +++++---
 interface/src/avatar/AvatarManager.cpp | 12 +++--------
 interface/src/avatar/AvatarManager.h   |  2 +-
 interface/src/ui/PreferencesDialog.cpp |  4 ++--
 interface/src/ui/Stats.cpp             |  4 ++--
 interface/src/ui/Stats.h               | 11 ++++++----
 8 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index 56d4f9c14b..7048efe55c 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -258,14 +258,14 @@ Item {
                     Text {
                         color: root.fontColor;
                         font.pixelSize: root.fontSize
-                        visible: root.expanded
+                        visible: root.showAcuity
                         text: "LOD: " + root.lodStatus;
                     }
                     Text {
                         color: root.fontColor;
                         font.pixelSize: root.fontSize
                         visible: root.expanded
-                        text: "Renderable avatars: " + root.avatarRenderableCount + " w/in " + root.avatarRenderDistance + "m";
+                        text: root.lodStatsRenderText;
                     }
                 }
             }
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 5ac2f687c7..9d61a1c02c 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <avatar/AvatarManager.h>
 #include <SettingHandle.h>
 #include <Util.h>
 
@@ -21,24 +22,31 @@
 Setting::Handle<float> desktopLODDecreaseFPS("desktopLODDecreaseFPS", DEFAULT_DESKTOP_LOD_DOWN_FPS);
 Setting::Handle<float> hmdLODDecreaseFPS("hmdLODDecreaseFPS", DEFAULT_HMD_LOD_DOWN_FPS);
 // There are two different systems in use, based on lodPreference:
-// pid: renderDistance is automatically adjusted such that frame rate targets are met.
-// acuity:  a pseudo-acuity target is held, or adjusted to match minimum frame rates.
+// pid: renderDistance is adjusted by a PID such that frame rate targets are met.
+// acuity:  a pseudo-acuity target is held, or adjusted to match minimum frame rates (and a PID controlls avatar rendering distance)
 // If unspecified, acuity is used only if user has specified non-default minumum frame rates.
 Setting::Handle<int> lodPreference("lodPreference", (int)LODManager::LODPreference::unspecified);
+const float SMALLEST_REASONABLE_HORIZON = 50.0f; // meters
+Setting::Handle<float> renderDistanceInverseHighLimit("renderDistanceInverseHighLimit", 1.0f / SMALLEST_REASONABLE_HORIZON);
+void LODManager::setRenderDistanceInverseHighLimit(float newValue) {
+    renderDistanceInverseHighLimit.set(newValue); // persist it, and tell all the controllers that use it
+    _renderDistanceController.setControlledValueHighLimit(newValue);
+   DependencyManager::get<AvatarManager>()->setRenderDistanceInverseHighLimit(newValue);
+}
 
 LODManager::LODManager() {
     calculateAvatarLODDistanceMultiplier();
 
-    _renderDistanceController.setControlledValueHighLimit(20.0f);
-    _renderDistanceController.setControlledValueLowLimit(1.0f / (float)TREE_SCALE);
+    setRenderDistanceInverseHighLimit(renderDistanceInverseHighLimit.get());
+    setRenderDistanceInverseLowLimit(1.0f / (float)TREE_SCALE);
     // Advice for tuning parameters:
     // See PIDController.h. There's a section on tuning in the reference.
     // Turn on logging with the following (or from js with AvatarList.setRenderDistanceControllerHistory("avatar render", 300))
     //_renderDistanceController.setHistorySize("avatar render", target_fps * 4);
     // Note that extra logging/hysteresis is turned off in Avatar.cpp when the above logging is on.
-    _renderDistanceController.setKP(0.000012f); // Usually about 0.6 of largest that doesn't oscillate when other parameters 0.
-    _renderDistanceController.setKI(0.00002f); // Big enough to bring us to target with the above KP.
-    _renderDistanceController.setHistorySize("FIXME", 240);
+    setRenderDistanceKP(0.000012f); // Usually about 0.6 of largest that doesn't oscillate when other parameters 0.
+    setRenderDistanceKI(0.00002f); // Big enough to bring us to target with the above KP.
+    //setRenderDistanceControllerHistory("FIXME", 240);
 }
 
 float LODManager::getLODDecreaseFPS() {
@@ -243,6 +251,14 @@ float LODManager::getRenderDistance() {
 int LODManager::getRenderedCount() {
     return lastRenderedCount;
 }
+QString LODManager::getLODStatsRenderText() {
+    if (getUseAcuity()) {
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        return QString("Renderable avatars: ") + QString::number(avatarManager->getNumberInRenderRange()) + " w/in " + QString::number((int)avatarManager->getRenderDistance()) + "m";
+    } else {
+        return QString("Rendered objects: ") + 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;
diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h
index 21a30bceaf..6b141004e5 100644
--- a/interface/src/LODManager.h
+++ b/interface/src/LODManager.h
@@ -89,16 +89,19 @@ public:
     };
     static bool getUseAcuity();
     static void setUseAcuity(bool newValue);
-    Q_INVOKABLE bool getRenderDistanceControllerIsLogging() { return _renderDistanceController.getIsLogging(); }
-    Q_INVOKABLE void setRenderDistanceControllerHistory(QString label, int size) { return _renderDistanceController.setHistorySize(label, size); }
     Q_INVOKABLE void setRenderDistanceKP(float newValue) { _renderDistanceController.setKP(newValue); }
     Q_INVOKABLE void setRenderDistanceKI(float newValue) { _renderDistanceController.setKI(newValue); }
     Q_INVOKABLE void setRenderDistanceKD(float newValue) { _renderDistanceController.setKD(newValue); }
+    Q_INVOKABLE bool getRenderDistanceControllerIsLogging() { return _renderDistanceController.getIsLogging(); }
+    Q_INVOKABLE void setRenderDistanceControllerHistory(QString label, int size) { return _renderDistanceController.setHistorySize(label, size); }
+    Q_INVOKABLE float getRenderDistanceInverseLowLimit() { return _renderDistanceController.getControlledValueLowLimit(); }
     Q_INVOKABLE void setRenderDistanceInverseLowLimit(float newValue) { _renderDistanceController.setControlledValueLowLimit(newValue); }
-    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue) { _renderDistanceController.setControlledValueHighLimit(newValue); }
+    Q_INVOKABLE float getRenderDistanceInverseHighLimit() { return _renderDistanceController.getControlledValueHighLimit(); }
+    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue);
     void updatePIDRenderDistance(float targetFps, float measuredFps, float deltaTime, bool isThrottled);
     float getRenderDistance();
     int getRenderedCount();
+    QString getLODStatsRenderText();
 
     static bool shouldRender(const RenderArgs* args, const AABox& bounds);
     bool shouldRenderMesh(float largestDimension, float distanceToCamera);
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 7c1a52f1b3..4f59e21cda 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -34,6 +34,7 @@
 #include "Application.h"
 #include "Avatar.h"
 #include "AvatarManager.h"
+#include "LODManager.h"
 #include "Menu.h"
 #include "MyAvatar.h"
 #include "SceneScriptingInterface.h"
@@ -76,13 +77,6 @@ AvatarManager::AvatarManager(QObject* parent) :
     packetReceiver.registerListener(PacketType::AvatarBillboard, this, "processAvatarBillboardPacket");
 }
 
-const float SMALLEST_REASONABLE_HORIZON = 5.0f; // meters
-Setting::Handle<float> avatarRenderDistanceInverseHighLimit("avatarRenderDistanceHighLimit", 1.0f / SMALLEST_REASONABLE_HORIZON);
-void AvatarManager::setRenderDistanceInverseHighLimit(float newValue) {
-    avatarRenderDistanceInverseHighLimit.set(newValue);
-     _renderDistanceController.setControlledValueHighLimit(newValue);
-}
-
 void AvatarManager::init() {
     _myAvatar->init();
     {
@@ -100,8 +94,8 @@ void AvatarManager::init() {
     scene->enqueuePendingChanges(pendingChanges);
 
     const float target_fps = qApp->getTargetFrameRate();
-    _renderDistanceController.setMeasuredValueSetpoint(target_fps);
-    _renderDistanceController.setControlledValueHighLimit(avatarRenderDistanceInverseHighLimit.get());
+    _renderDistanceController.setMeasuredValueSetpoint(target_fps / 2.0f);
+    _renderDistanceController.setControlledValueHighLimit(DependencyManager::get<LODManager>()->getRenderDistanceInverseHighLimit());
     _renderDistanceController.setControlledValueLowLimit(1.0f / (float) TREE_SCALE);
     // Advice for tuning parameters:
     // See PIDController.h. There's a section on tuning in the reference.
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index 84a4bc44b8..290dda3668 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -79,7 +79,7 @@ public:
     Q_INVOKABLE void setRenderDistanceKI(float newValue) { _renderDistanceController.setKI(newValue); }
     Q_INVOKABLE void setRenderDistanceKD(float newValue) { _renderDistanceController.setKD(newValue); }
     Q_INVOKABLE void setRenderDistanceInverseLowLimit(float newValue) { _renderDistanceController.setControlledValueLowLimit(newValue); }
-    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue);
+    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue) { _renderDistanceController.setControlledValueHighLimit(newValue); }
    
 public slots:
     void setShouldShowReceiveStats(bool shouldShowReceiveStats) { _shouldShowReceiveStats = shouldShowReceiveStats; }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index bc08391bbe..133fc409fb 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -225,7 +225,7 @@ void PreferencesDialog::loadPreferences() {
     ui.useAcuityCheckBox->setChecked(lodManager->getUseAcuity());
     ui.desktopMinimumFPSSpin->setValue(lodManager->getDesktopLODDecreaseFPS());
     ui.hmdMinimumFPSSpin->setValue(lodManager->getHMDLODDecreaseFPS());
-    ui.smallestReasonableRenderHorizon->setValue(1.0f / DependencyManager::get<AvatarManager>()->getRenderDistanceInverseHighLimit());
+    ui.smallestReasonableRenderHorizon->setValue(1.0f / lodManager->getRenderDistanceInverseHighLimit());
     changeUseAcuity();
 }
 
@@ -318,5 +318,5 @@ void PreferencesDialog::savePreferences() {
     lodManager->setUseAcuity(ui.useAcuityCheckBox->isChecked());
     lodManager->setDesktopLODDecreaseFPS(ui.desktopMinimumFPSSpin->value());
     lodManager->setHMDLODDecreaseFPS(ui.hmdMinimumFPSSpin->value());
-    DependencyManager::get<AvatarManager>()->setRenderDistanceInverseHighLimit(1.0f / ui.smallestReasonableRenderHorizon->value());
+    lodManager->setRenderDistanceInverseHighLimit(1.0f / ui.smallestReasonableRenderHorizon->value());
 }
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index a86ed97f0c..b82ab93068 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -283,9 +283,9 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(localLeaves, (int)OctreeElement::getLeafNodeCount());
         // LOD Details
         STAT_UPDATE(lodStatus, "You can see " + DependencyManager::get<LODManager>()->getLODFeedbackText());
-        STAT_UPDATE(avatarRenderableCount, DependencyManager::get<LODManager>()->getRenderedCount()); //FIXME avatarManager->getNumberInRenderRange());
-        STAT_UPDATE(avatarRenderDistance, (int)round(DependencyManager::get<LODManager>()->getRenderDistance())); // FIXME avatarManager->getRenderDistance())); // deliberately truncating
+        STAT_UPDATE(lodStatsRenderText, DependencyManager::get<LODManager>()->getLODStatsRenderText());
     }
+    STAT_UPDATE(showAcuity, (_expanded || force) && DependencyManager::get<LODManager>()->getUseAcuity());
 
     bool performanceTimerIsActive = PerformanceTimer::isActive();
     bool displayPerf = _expanded && Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails);
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index eb28883001..5e948ce0f0 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -30,6 +30,7 @@ class Stats : public QQuickItem {
     Q_PROPERTY(QString monospaceFont READ monospaceFont CONSTANT)
     Q_PROPERTY(float audioPacketlossUpstream READ getAudioPacketLossUpstream)
     Q_PROPERTY(float audioPacketlossDownstream READ getAudioPacketLossDownstream)
+    Q_PROPERTY(bool showAcuity READ getShowAcuity WRITE setShowAcuity NOTIFY showAcuityChanged)
 
     STATS_PROPERTY(int, serverCount, 0)
     STATS_PROPERTY(int, renderrate, 0)
@@ -37,8 +38,6 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, simrate, 0)
     STATS_PROPERTY(int, avatarSimrate, 0)
     STATS_PROPERTY(int, avatarCount, 0)
-    STATS_PROPERTY(int, avatarRenderableCount, 0)
-    STATS_PROPERTY(int, avatarRenderDistance, 0)
     STATS_PROPERTY(int, packetInCount, 0)
     STATS_PROPERTY(int, packetOutCount, 0)
     STATS_PROPERTY(float, mbpsIn, 0)
@@ -77,6 +76,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(QString, packetStats, QString())
     STATS_PROPERTY(QString, lodStatus, QString())
     STATS_PROPERTY(QString, timingStats, QString())
+    STATS_PROPERTY(QString, lodStatsRenderText, QString())
     STATS_PROPERTY(int, serverElements, 0)
     STATS_PROPERTY(int, serverInternal, 0)
     STATS_PROPERTY(int, serverLeaves, 0)
@@ -108,12 +108,15 @@ public:
             emit expandedChanged();
         }
     }
+    bool getShowAcuity() { return _showAcuity; }
+    void setShowAcuity(bool newValue) { _showAcuity = newValue; }
 
 public slots:
     void forceUpdateStats() { updateStats(true); }
 
 signals:
     void expandedChanged();
+    void showAcuityChanged();
     void timingExpandedChanged();
     void serverCountChanged();
     void renderrateChanged();
@@ -121,8 +124,7 @@ signals:
     void simrateChanged();
     void avatarSimrateChanged();
     void avatarCountChanged();
-    void avatarRenderableCountChanged();
-    void avatarRenderDistanceChanged();
+    void lodStatsRenderTextChanged();
     void packetInCountChanged();
     void packetOutCountChanged();
     void mbpsInChanged();
@@ -172,6 +174,7 @@ private:
     int _recentMaxPackets{ 0 } ; // recent max incoming voxel packets to process
     bool _resetRecentMaxPacketsSoon{ true };
     bool _expanded{ false };
+    bool _showAcuity{ false };
     bool _timingExpanded{ false };
     QString _monospaceFont;
     const AudioIOStats* _audioStats;

From e058057e3da120b2b183faa5605b8948f85136f6 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Wed, 16 Dec 2015 15:41:23 -0800
Subject: [PATCH 04/10] fix logging

---
 libraries/shared/src/PIDController.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/shared/src/PIDController.h b/libraries/shared/src/PIDController.h
index 0b2411530a..0a376872cc 100644
--- a/libraries/shared/src/PIDController.h
+++ b/libraries/shared/src/PIDController.h
@@ -31,7 +31,7 @@ public:
     float update(float measuredValue, float dt, bool resetAccumulator = false); // returns the new computedValue
     void setHistorySize(QString label = QString(""), int size = 0) { _history.reserve(size); _history.resize(0); _label = label; } // non-empty does logging
 
-    bool getIsLogging() { return _history.capacity(); }
+    bool getIsLogging() { return !_label.isEmpty(); }
     float getMeasuredValueSetpoint() const { return _measuredValueSetpoint; }
     // In normal operation (where we can easily reach setpoint), controlledValue is typcially pinned at max.
     // Defaults to [0, max float], but for 1/LODdistance, it might be, say, [0, 0.2 or 0.1]

From 23ffcdca3e354259e3afbd8dc9c5cd829b315745 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Wed, 16 Dec 2015 17:01:14 -0800
Subject: [PATCH 05/10] big sweep

---
 interface/src/LODManager.cpp           |  9 ++-----
 interface/src/Menu.h                   |  2 +-
 interface/src/avatar/Avatar.cpp        | 20 ---------------
 interface/src/avatar/AvatarManager.cpp | 34 --------------------------
 interface/src/avatar/AvatarManager.h   | 20 +--------------
 interface/src/ui/PreferencesDialog.cpp |  1 +
 6 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 9d61a1c02c..eafc3b29f2 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -31,7 +31,6 @@ Setting::Handle<float> renderDistanceInverseHighLimit("renderDistanceInverseHigh
 void LODManager::setRenderDistanceInverseHighLimit(float newValue) {
     renderDistanceInverseHighLimit.set(newValue); // persist it, and tell all the controllers that use it
     _renderDistanceController.setControlledValueHighLimit(newValue);
-   DependencyManager::get<AvatarManager>()->setRenderDistanceInverseHighLimit(newValue);
 }
 
 LODManager::LODManager() {
@@ -252,12 +251,8 @@ int LODManager::getRenderedCount() {
     return lastRenderedCount;
 }
 QString LODManager::getLODStatsRenderText() {
-    if (getUseAcuity()) {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        return QString("Renderable avatars: ") + QString::number(avatarManager->getNumberInRenderRange()) + " w/in " + QString::number((int)avatarManager->getRenderDistance()) + "m";
-    } else {
-        return QString("Rendered objects: ") + QString::number(getRenderedCount()) + " w/in " + QString::number((int)getRenderDistance()) + "m";
-    }
+    QString label = getUseAcuity() ? "Renderable avatars: " : "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) {
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 55266cf062..22da7d9127 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -64,6 +64,7 @@ public:
     void saveSettings();
 
     MenuWrapper* getMenu(const QString& menuName);
+    MenuWrapper* getSubMenuFromName(const QString& menuName, MenuWrapper* menu);
 
     void triggerOption(const QString& menuOption);
     QAction* getActionForOption(const QString& menuOption);
@@ -128,7 +129,6 @@ private:
                                        const QString& grouping = QString());
 
     QAction* getActionFromName(const QString& menuName, MenuWrapper* menu);
-    MenuWrapper* getSubMenuFromName(const QString& menuName, MenuWrapper* menu);
     MenuWrapper* getMenuParent(const QString& menuName, QString& finalMenuPart);
 
     QAction* getMenuAction(const QString& menuName);
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 7a234f2b47..9cede63ab0 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -164,26 +164,6 @@ void Avatar::simulate(float deltaTime) {
         _shouldRenderBillboard = true;
         qCDebug(interfaceapp) << "Billboarding" << (isMyAvatar() ? "myself" : getSessionUUID()) << "for LOD" << getLODDistance();
     }
-    
-    const bool isControllerLogging = DependencyManager::get<AvatarManager>()->getRenderDistanceControllerIsLogging();
-    float renderDistance = DependencyManager::get<AvatarManager>()->getRenderDistance();
-    const float SKIP_HYSTERESIS_PROPORTION = isControllerLogging ? 0.0f : BILLBOARD_HYSTERESIS_PROPORTION;
-    float distance = glm::distance(qApp->getCamera()->getPosition(), getPosition());
-    if (_shouldSkipRender) {
-        if (distance < renderDistance * (1.0f - SKIP_HYSTERESIS_PROPORTION)) {
-            _shouldSkipRender = false;
-            _skeletonModel.setVisibleInScene(true, qApp->getMain3DScene());
-            if (!isControllerLogging) {  // Test for isMyAvatar is prophylactic. Never occurs in current code.
-                qCDebug(interfaceapp) << "Rerendering" << (isMyAvatar() ? "myself" : getSessionUUID()) << "for distance" << renderDistance;
-            }
-        }
-    } else if (distance > renderDistance * (1.0f + SKIP_HYSTERESIS_PROPORTION)) {
-        _shouldSkipRender = true;
-        _skeletonModel.setVisibleInScene(false, qApp->getMain3DScene());
-        if (!isControllerLogging) {
-            qCDebug(interfaceapp) << "Unrendering" << (isMyAvatar() ? "myself" : getSessionUUID()) << "for distance" << renderDistance;
-        }
-    }
 
     // simple frustum check
     float boundingRadius = getBillboardSize();
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 4f59e21cda..a6fa611914 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -92,19 +92,6 @@ void AvatarManager::init() {
         _myAvatar->addToScene(_myAvatar, scene, pendingChanges);
     }
     scene->enqueuePendingChanges(pendingChanges);
-
-    const float target_fps = qApp->getTargetFrameRate();
-    _renderDistanceController.setMeasuredValueSetpoint(target_fps / 2.0f);
-    _renderDistanceController.setControlledValueHighLimit(DependencyManager::get<LODManager>()->getRenderDistanceInverseHighLimit());
-    _renderDistanceController.setControlledValueLowLimit(1.0f / (float) TREE_SCALE);
-    // Advice for tuning parameters:
-    // See PIDController.h. There's a section on tuning in the reference.
-    // Turn on logging with the following (or from js with AvatarList.setRenderDistanceControllerHistory("avatar render", 300))
-    //_renderDistanceController.setHistorySize("avatar render", target_fps * 4);
-    // Note that extra logging/hysteresis is turned off in Avatar.cpp when the above logging is on.
-    _renderDistanceController.setKP(0.0008f); // Usually about 0.6 of largest that doesn't oscillate when other parameters 0.
-    _renderDistanceController.setKI(0.0006f); // Big enough to bring us to target with the above KP.
-    _renderDistanceController.setKD(0.000001f); // A touch of kd increases the speed by which we get there.
 }
 
 void AvatarManager::updateMyAvatar(float deltaTime) {
@@ -139,23 +126,6 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
 
     PerformanceTimer perfTimer("otherAvatars");
     
-    float distance;
-    if (!qApp->isThrottleRendering()) {
-        _renderDistanceController.setMeasuredValueSetpoint(qApp->getTargetFrameRate()); // 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
-        // goes up.
-        const float deduced = qApp->getLastUnsynchronizedFps();
-        distance = 1.0f / _renderDistanceController.update(deduced, deltaTime);
-    } else {
-        // Here we choose to just use the maximum render cutoff distance if throttled.
-        distance = 1.0f / _renderDistanceController.getControlledValueLowLimit();
-    }
-    _renderDistanceAverage.updateAverage(distance);
-    _renderDistance = _renderDistanceAverage.getAverage();
-    int renderableCount = 0;
-
     // simulate avatars
     auto hashCopy = getHashCopy();
     
@@ -173,14 +143,10 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
         } else {
             avatar->startUpdate();
             avatar->simulate(deltaTime);
-            if (avatar->getShouldRender()) {
-                renderableCount++;
-            }
             avatar->endUpdate();
             ++avatarIterator;
         }
     }
-    _renderedAvatarCount = renderableCount;
 
     // simulate avatar fades
     simulateAvatarFades(deltaTime);
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index 290dda3668..0e3dab109d 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -45,7 +45,6 @@ public:
     void clearOtherAvatars();
    
     bool shouldShowReceiveStats() const { return _shouldShowReceiveStats; }
-    PIDController& getRenderDistanceController()  { return _renderDistanceController; }
 
     class LocalLight {
     public:
@@ -67,20 +66,7 @@ public:
     void handleCollisionEvents(const CollisionEvents& collisionEvents);
 
     void updateAvatarPhysicsShape(Avatar* avatar);
-    
-    // Expose results and parameter-tuning operations to other systems, such as stats and javascript.
-    Q_INVOKABLE float getRenderDistance() { return _renderDistance; }
-    Q_INVOKABLE float getRenderDistanceInverseLowLimit() { return _renderDistanceController.getControlledValueLowLimit(); }
-    Q_INVOKABLE float getRenderDistanceInverseHighLimit() { return _renderDistanceController.getControlledValueHighLimit(); }
-    Q_INVOKABLE int getNumberInRenderRange() { return _renderedAvatarCount; }
-    Q_INVOKABLE bool getRenderDistanceControllerIsLogging() { return _renderDistanceController.getIsLogging(); }
-    Q_INVOKABLE void setRenderDistanceControllerHistory(QString label, int size) { return _renderDistanceController.setHistorySize(label, size); }
-    Q_INVOKABLE void setRenderDistanceKP(float newValue) { _renderDistanceController.setKP(newValue); }
-    Q_INVOKABLE void setRenderDistanceKI(float newValue) { _renderDistanceController.setKI(newValue); }
-    Q_INVOKABLE void setRenderDistanceKD(float newValue) { _renderDistanceController.setKD(newValue); }
-    Q_INVOKABLE void setRenderDistanceInverseLowLimit(float newValue) { _renderDistanceController.setControlledValueLowLimit(newValue); }
-    Q_INVOKABLE void setRenderDistanceInverseHighLimit(float newValue) { _renderDistanceController.setControlledValueHighLimit(newValue); }
-   
+       
 public slots:
     void setShouldShowReceiveStats(bool shouldShowReceiveStats) { _shouldShowReceiveStats = shouldShowReceiveStats; }
     void updateAvatarRenderStatus(bool shouldRenderAvatars);
@@ -106,10 +92,6 @@ private:
     QVector<AvatarManager::LocalLight> _localLights;
 
     bool _shouldShowReceiveStats = false;
-    float _renderDistance { (float) TREE_SCALE };
-    int _renderedAvatarCount { 0 };
-    PIDController _renderDistanceController { };
-    SimpleMovingAverage _renderDistanceAverage { 10 };
 
     SetOfAvatarMotionStates _avatarMotionStates;
     SetOfMotionStates _motionStatesToAdd;
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 133fc409fb..c561aa1b36 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -67,6 +67,7 @@ void PreferencesDialog::changeUseAcuity() {
     ui.hmdMinimumFPSSpin->setEnabled(useAcuity);
     ui.label_smallestReasonableRenderHorizon->setText(useAcuity ? "Minimum Avatar Display Distance (@half speed)" : "Minimum Display Distance (@half speed)");
     Menu::getInstance()->getActionForOption(MenuOption::LodTools)->setEnabled(useAcuity);
+    Menu::getInstance()->getSubMenuFromName(MenuOption::RenderResolution, Menu::getInstance()->getSubMenuFromName("Render", Menu::getInstance()->getMenu("Developer")))->setEnabled(useAcuity);
 }
 void PreferencesDialog::changeFullAvatarURL() {
     DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(ui.appearanceDescription->text(), "");

From 7e54e1f7536694f3a7f3107e8dd7592815740ee7 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 16 Dec 2015 20:25:37 -0800
Subject: [PATCH 06/10] missed menu

---
 interface/src/LODManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index eafc3b29f2..5f55e0fed0 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -384,6 +384,7 @@ void LODManager::loadSettings() {
         setUseAcuity((getDesktopLODDecreaseFPS() != DEFAULT_DESKTOP_LOD_DOWN_FPS) || (getHMDLODDecreaseFPS() != DEFAULT_HMD_LOD_DOWN_FPS));
     }
     Menu::getInstance()->getActionForOption(MenuOption::LodTools)->setEnabled(getUseAcuity());
+    Menu::getInstance()->getSubMenuFromName(MenuOption::RenderResolution, Menu::getInstance()->getSubMenuFromName("Render", Menu::getInstance()->getMenu("Developer")))->setEnabled(getUseAcuity());
 }
 
 void LODManager::saveSettings() {

From 5ac5ecfc224b7695bfa1bc11e54d37ead8bf45a4 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 16 Dec 2015 20:35:56 -0800
Subject: [PATCH 07/10] drop obsolete include

---
 interface/src/avatar/AvatarManager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index a6fa611914..b550ce131f 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -34,7 +34,6 @@
 #include "Application.h"
 #include "Avatar.h"
 #include "AvatarManager.h"
-#include "LODManager.h"
 #include "Menu.h"
 #include "MyAvatar.h"
 #include "SceneScriptingInterface.h"

From 75814e712c9ed4804b36d4dcc7919dc371b8307b Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 16 Dec 2015 20:56:54 -0800
Subject: [PATCH 08/10] compiler warning

---
 interface/src/ui/ApplicationCompositor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp
index e5ecdfe217..abc3520c83 100644
--- a/interface/src/ui/ApplicationCompositor.cpp
+++ b/interface/src/ui/ApplicationCompositor.cpp
@@ -34,7 +34,6 @@
 static const quint64 MSECS_TO_USECS = 1000ULL;
 static const quint64 TOOLTIP_DELAY = 500 * MSECS_TO_USECS;
 
-static const float RETICLE_COLOR[] = { 0.0f, 198.0f / 255.0f, 244.0f / 255.0f };
 static const float reticleSize = TWO_PI / 100.0f;
 
 static const float CURSOR_PIXEL_SIZE = 32.0f;

From 41052083c3fd141747c6ef4f7bd86c9582c0cb4e Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Fri, 18 Dec 2015 17:05:58 -0800
Subject: [PATCH 09/10] Render scenery even if it is far away.

---
 interface/src/LODManager.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 5f55e0fed0..1dff1da0a7 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -40,12 +40,11 @@ LODManager::LODManager() {
     setRenderDistanceInverseLowLimit(1.0f / (float)TREE_SCALE);
     // Advice for tuning parameters:
     // See PIDController.h. There's a section on tuning in the reference.
-    // Turn on logging with the following (or from js with AvatarList.setRenderDistanceControllerHistory("avatar render", 300))
-    //_renderDistanceController.setHistorySize("avatar render", target_fps * 4);
+    // Turn on logging with the following (or from js with LODManager.setRenderDistanceControllerHistory("render pid", 240))
+    //setRenderDistanceControllerHistory("render pid", 60 * 4);
     // Note that extra logging/hysteresis is turned off in Avatar.cpp when the above logging is on.
     setRenderDistanceKP(0.000012f); // Usually about 0.6 of largest that doesn't oscillate when other parameters 0.
     setRenderDistanceKI(0.00002f); // Big enough to bring us to target with the above KP.
-    //setRenderDistanceControllerHistory("FIXME", 240);
 }
 
 float LODManager::getLODDecreaseFPS() {
@@ -279,7 +278,9 @@ bool LODManager::shouldRender(const RenderArgs* args, const AABox& bounds) {
     float distanceToCamera = glm::length(bounds.calcCenter() - args->_viewFrustum->getPosition());
     float largestDimension = bounds.getLargestDimension();
     if (!getUseAcuity()) {
-        bool isRendered = fabsf(distanceToCamera - largestDimension) < renderDistance;
+        const float scenerySize = 300; // meters
+        bool isRendered = (largestDimension > scenerySize) || // render scenery regardless of distance
+            (fabsf(distanceToCamera - largestDimension) < renderDistance);
         renderedCount += isRendered ? 1 : 0;
         return isRendered;
     }

From 342d3e80bc87be9d00eb22b4582d4c6df132d9f1 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Mon, 4 Jan 2016 09:49:25 -0800
Subject: [PATCH 10/10] fix MSVC formatting

---
 interface/src/LODManager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 1dff1da0a7..10a288a44e 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -263,8 +263,7 @@ void LODManager::updatePIDRenderDistance(float targetFps, float measuredFps, flo
         // goes up, the render cutoff distance gets closer, the number of rendered avatars is less, and frame rate
         // goes up.
         distance = 1.0f / _renderDistanceController.update(measuredFps, deltaTime);
-    }
-    else {
+    } else {
         // Here we choose to just use the maximum render cutoff distance if throttled.
         distance = 1.0f / _renderDistanceController.getControlledValueLowLimit();
     }