Merge branch 'master' into 20872

interface/src/LODManager.h

@@ -40,11 +40,10 @@ const int UP_SHIFT_SAMPLES_OF_FRAMES = ASSUMED_FPS * UP_SHIFT_WINDOW_IN_SECS;
 const float ADJUST_LOD_DOWN_BY = 0.9f;
 const float ADJUST_LOD_UP_BY = 1.1f;
 
-// This controls how low the auto-adjust LOD will go a value of 1 means it will adjust to a point where you must be 0.25
-// meters away from an object of TREE_SCALE before you can see it (which is effectively completely blind). The default value
-// DEFAULT_OCTREE_SIZE_SCALE means you can be 400 meters away from a 1 meter object in order to see it (which is ~20:20 vision).
-const float ADJUST_LOD_MIN_SIZE_SCALE = 1.0f;
+// The default value DEFAULT_OCTREE_SIZE_SCALE means you can be 400 meters away from a 1 meter object in order to see it (which is ~20:20 vision).
 const float ADJUST_LOD_MAX_SIZE_SCALE = DEFAULT_OCTREE_SIZE_SCALE;
+// This controls how low the auto-adjust LOD will go. We want a minimum vision of ~20:500 or 0.04 of default
+const float ADJUST_LOD_MIN_SIZE_SCALE = DEFAULT_OCTREE_SIZE_SCALE * 0.04f;
 
 class RenderArgs;
 class AABox;

interface/src/ui/LodToolsDialog.cpp

@@ -51,8 +51,8 @@ LodToolsDialog::LodToolsDialog(QWidget* parent) :
     connect(_manualLODAdjust, SIGNAL(toggled(bool)), SLOT(updateAutomaticLODAdjust()));
     
     _lodSize = new QSlider(Qt::Horizontal, this);
-    const int MAX_LOD_SIZE = MAX_LOD_SIZE_MULTIPLIER;
-    const int MIN_LOD_SIZE = ADJUST_LOD_MIN_SIZE_SCALE;
+    const int MAX_LOD_SIZE = 2000; // ~20:4 vision -- really good.
+    const int MIN_LOD_SIZE = 5; // ~20:1600 vision -- really bad!
     const int STEP_LOD_SIZE = 1;
     const int PAGE_STEP_LOD_SIZE = 100;
     const int SLIDER_WIDTH = 300;

libraries/gpu/src/gpu/GLBackendShader.cpp

@@ -38,7 +38,7 @@ bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const s
     GLuint glshader = glCreateShader(shaderDomain);
     if (!glshader) {
         qCDebug(gpulogging) << "GLShader::compileShader - failed to create the gl shader object";
-        return nullptr;
+        return false;
     }
 
     // Assign the source

plugins/oculus/src/OculusHelpers.cpp

@@ -10,6 +10,7 @@
 
 #include <atomic>
 
+#include <Windows.h>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QFile>
 #include <QtCore/QDir>
@@ -41,23 +42,28 @@ void logFatal(const char* what) {
     qFatal(error.c_str());
 }
 
-static const QString OCULUS_RUNTIME_PATH { "C:\\Program Files (x86)\\Oculus\\Support\\oculus-runtime" };
-static const QString GOOD_OCULUS_RUNTIME_FILE { OCULUS_RUNTIME_PATH + "\\LibOVRRT64_1.dll" };
+
+static wchar_t* REQUIRED_OCULUS_DLL = L"LibOVRRT64_1.dll";
+static wchar_t FOUND_PATH[MAX_PATH];
 
 bool oculusAvailable() {
-    ovrDetectResult detect = ovr_Detect(0);
-    if (!detect.IsOculusServiceRunning || !detect.IsOculusHMDConnected) {
-        return false;
-    }
+    static std::once_flag once;
+    static bool result { false };
+    std::call_once(once, [&] {
+        ovrDetectResult detect = ovr_Detect(0);
+        if (!detect.IsOculusServiceRunning || !detect.IsOculusHMDConnected) {
+            return;
+        }
 
-    // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it 
-    // doesn't exist
-    if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) {
-        qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present: \"" + GOOD_OCULUS_RUNTIME_FILE + "\"";
-        return false;
-    }
+        DWORD searchResult = SearchPathW(NULL, REQUIRED_OCULUS_DLL, NULL, MAX_PATH, FOUND_PATH, NULL);
+        if (searchResult <= 0) {
+            return;
+        }
 
-    return true;
+        result = true;
+    });
+
+    return result;
 }
 
 ovrSession acquireOculusSession() {
@@ -67,10 +73,6 @@ ovrSession acquireOculusSession() {
     }
 
     if (!session) {
-        ovrInitParams init = {};
-        init.Flags = 0;
-        init.ConnectionTimeoutMS = 0;
-        init.LogCallback = nullptr;
         if (!OVR_SUCCESS(ovr_Initialize(nullptr))) {
             logWarning("Failed to initialize Oculus SDK");
             return session;