Moved Menu::shouldRenderMesh() to LODManager

interface/src/Application.cpp

@@ -2648,7 +2648,7 @@ void Application::setupWorldLight() {
 }
 
 bool Application::shouldRenderMesh(float largestDimension, float distanceToCamera) {
-    return Menu::getInstance()->shouldRenderMesh(largestDimension, distanceToCamera);
+    return DependencyManager::get<LODManager>()->shouldRenderMesh(largestDimension, distanceToCamera);
 }
 
 float Application::getSizeScale() const { 

interface/src/LODManager.cpp

@@ -138,6 +138,44 @@ void LODManager::setBoundaryLevelAdjust(int boundaryLevelAdjust) {
     _shouldRenderTableNeedsRebuilding = true;
 }
 
+// TODO: This is essentially the same logic used to render octree cells, but since models are more detailed then octree cells
+//       I've added a voxelToModelRatio that adjusts how much closer to a model you have to be to see it.
+bool LODManager::shouldRenderMesh(float largestDimension, float distanceToCamera) {
+    const float octreeToMeshRatio = 4.0f; // must be this many times closer to a mesh than a voxel to see it.
+    float octreeSizeScale = getOctreeSizeScale();
+    int boundaryLevelAdjust = getBoundaryLevelAdjust();
+    float maxScale = (float)TREE_SCALE;
+    float visibleDistanceAtMaxScale = boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale) / octreeToMeshRatio;
+    
+    if (_shouldRenderTableNeedsRebuilding) {
+        _shouldRenderTable.clear();
+        
+        float SMALLEST_SCALE_IN_TABLE = 0.001f; // 1mm is plenty small
+        float scale = maxScale;
+        float visibleDistanceAtScale = visibleDistanceAtMaxScale;
+        
+        while (scale > SMALLEST_SCALE_IN_TABLE) {
+            scale /= 2.0f;
+            visibleDistanceAtScale /= 2.0f;
+            _shouldRenderTable[scale] = visibleDistanceAtScale;
+        }
+        _shouldRenderTableNeedsRebuilding = false;
+    }
+    
+    float closestScale = maxScale;
+    float visibleDistanceAtClosestScale = visibleDistanceAtMaxScale;
+    QMap<float, float>::const_iterator lowerBound = _shouldRenderTable.lowerBound(largestDimension);
+    if (lowerBound != _shouldRenderTable.constEnd()) {
+        closestScale = lowerBound.key();
+        visibleDistanceAtClosestScale = lowerBound.value();
+    }
+    
+    if (closestScale < largestDimension) {
+        visibleDistanceAtClosestScale *= 2.0f;
+    }
+    
+    return (distanceToCamera <= visibleDistanceAtClosestScale);
+}
 
 void LODManager::loadSettings(QSettings* settings) {
     bool lockedSettings = false;

interface/src/LODManager.h

@@ -70,8 +70,10 @@ public:
     void autoAdjustLOD(float currentFPS);
     void resetLODAdjust();
     
+    bool shouldRenderMesh(float largestDimension, float distanceToCamera);
+    
 private:
-    LODManager();
+    LODManager() {}
     
     void loadSettings(QSettings* settings);
     void saveSettings(QSettings* settings);

interface/src/Menu.cpp

@@ -1388,45 +1388,6 @@ void Menu::octreeStatsDetails() {
     _octreeStatsDialog->raise();
 }
 
-// TODO: This is essentially the same logic used to render octree cells, but since models are more detailed then octree cells
-//       I've added a voxelToModelRatio that adjusts how much closer to a model you have to be to see it.
-bool Menu::shouldRenderMesh(float largestDimension, float distanceToCamera) {
-    const float octreeToMeshRatio = 4.0f; // must be this many times closer to a mesh than a voxel to see it.
-    float octreeSizeScale = getOctreeSizeScale();
-    int boundaryLevelAdjust = getBoundaryLevelAdjust();
-    float maxScale = (float)TREE_SCALE;
-    float visibleDistanceAtMaxScale = boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale) / octreeToMeshRatio;
-    
-    if (_shouldRenderTableNeedsRebuilding) {
-        _shouldRenderTable.clear();
-
-        float SMALLEST_SCALE_IN_TABLE = 0.001f; // 1mm is plenty small
-        float scale = maxScale;
-        float visibleDistanceAtScale = visibleDistanceAtMaxScale;
-
-        while (scale > SMALLEST_SCALE_IN_TABLE) {
-            scale /= 2.0f;
-            visibleDistanceAtScale /= 2.0f;
-            _shouldRenderTable[scale] = visibleDistanceAtScale;
-        }
-        _shouldRenderTableNeedsRebuilding = false;
-    }
-
-    float closestScale = maxScale;
-    float visibleDistanceAtClosestScale = visibleDistanceAtMaxScale;
-    QMap<float, float>::const_iterator lowerBound = _shouldRenderTable.lowerBound(largestDimension);
-    if (lowerBound != _shouldRenderTable.constEnd()) {
-        closestScale = lowerBound.key();
-        visibleDistanceAtClosestScale = lowerBound.value();
-    }
-    
-    if (closestScale < largestDimension) {
-        visibleDistanceAtClosestScale *= 2.0f;
-    }
-
-    return (distanceToCamera <= visibleDistanceAtClosestScale);
-}
-
 void Menu::cachesSizeDialog() {
     qDebug() << "Caches size:" << _cachesSizeDialog.isNull();
     if (!_cachesSizeDialog) {

interface/src/Menu.h

@@ -28,7 +28,6 @@
 
 #include "devices/Faceshift.h"
 #include "devices/SixenseManager.h"
-#include "LODManager.h"
 #include "ui/ChatWindow.h"
 #include "ui/JSConsole.h"
 #include "ui/ScriptEditorWindow.h"
@@ -165,8 +164,6 @@ public:
 
     bool getShadowsEnabled() const;
 
-    bool shouldRenderMesh(float largestDimension, float distanceToCamera);
-
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     SpeechRecognizer* getSpeechRecognizer() { return &_speechRecognizer; }
 #endif

interface/src/avatar/Avatar.cpp

@@ -25,6 +25,7 @@
 #include <DeferredLightingEffect.h>
 #include <GeometryUtil.h>
 #include <GlowEffect.h>
+#include <LODManager.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
 #include <PathUtils.h>

interface/src/ui/LodToolsDialog.cpp

@@ -9,17 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QFormLayout>
-#include <QDialogButtonBox>
-
-#include <QPalette>
 #include <QCheckBox>
 #include <QColor>
+#include <QDialogButtonBox>
 #include <QDoubleSpinBox>
-#include <QSlider>
+#include <QFormLayout>
+#include <QPalette>
 #include <QPushButton>
+#include <QSlider>
 #include <QString>
 
+#include <LODManager.h>
+
 #include "Menu.h"
 #include "ui/LodToolsDialog.h"
 

interface/src/ui/Stats.cpp

@@ -18,6 +18,7 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/vector_angle.hpp>
 
+#include <LODManager.h>
 #include <PerfStat.h>
 
 #include "Stats.h"

interface/src/ui/overlays/Overlays.cpp

@@ -8,12 +8,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <QScriptValueIterator>
+
 #include <limits>
 #include <typeinfo>
+
 #include <Application.h>
 #include <devices/OculusManager.h>
-#include <Menu.h>
-#include <QScriptValueIterator>
+#include <LODManager.h>
 
 #include "BillboardOverlay.h"
 #include "Circle3DOverlay.h"