Re-enable OpenVR plugin

* Enabled preview window
* rendering is only mono for some-reason.

cmake/externals/openvr/CMakeLists.txt

@@ -7,8 +7,8 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL https://github.com/ValveSoftware/openvr/archive/v0.9.12.zip
-  URL_MD5 c08dced68ce4e341e1467e6814ae419d
+  URL https://github.com/ValveSoftware/openvr/archive/v0.9.15.zip
+  URL_MD5 0ff8560b49b6da1150fcc47360e8ceca
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""

plugins/openvr/CMakeLists.txt

@@ -6,20 +6,17 @@
 #  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
 #
 
-# OpenVR is disabled until a) it works with threaded present and 
-# b) it doesn't interfere with Oculus SDK 0.8 
-if (FALSE)
-#if (WIN32)
+if (WIN32)
     # we're using static GLEW, so define GLEW_STATIC
     add_definitions(-DGLEW_STATIC)
     set(TARGET_NAME openvr)
     setup_hifi_plugin(OpenGL Script Qml Widgets)
-    link_hifi_libraries(shared gl networking controllers 
-        plugins display-plugins input-plugins script-engine 
+    link_hifi_libraries(shared gl networking controllers
+        plugins display-plugins input-plugins script-engine
         render-utils model gpu render model-networking fbx)
 
     include_hifi_library_headers(octree)
-    
+
     add_dependency_external_projects(OpenVR)
     find_package(OpenVR REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})

plugins/openvr/src/OpenVrDisplayPlugin.cpp

@@ -115,6 +115,10 @@ void OpenVrDisplayPlugin::customizeContext() {
         glGetError();
     });
     WindowOpenGLDisplayPlugin::customizeContext();
+
+    enableVsync(false);
+    // Only enable mirroring if we know vsync is disabled
+    _enablePreview = !isVsyncEnabled();
 }
 
 uvec2 OpenVrDisplayPlugin::getRecommendedRenderSize() const {
@@ -156,6 +160,22 @@ void OpenVrDisplayPlugin::internalPresent() {
     // Flip y-axis since GL UV coords are backwards.
     static vr::VRTextureBounds_t leftBounds{ 0, 0, 0.5f, 1 };
     static vr::VRTextureBounds_t rightBounds{ 0.5f, 0, 1, 1 };
+
+    // screen preview mirroring
+    if (_enablePreview) {
+        auto windowSize = toGlm(_window->size());
+        if (_monoPreview) {
+            glViewport(0, 0, windowSize.x * 2, windowSize.y);
+            glScissor(0, windowSize.y, windowSize.x, windowSize.y);
+        } else {
+            glViewport(0, 0, windowSize.x, windowSize.y);
+        }
+        glBindTexture(GL_TEXTURE_2D, _currentSceneTexture);
+        GLenum err = glGetError();
+        Q_ASSERT(0 == err);
+        drawUnitQuad();
+    }
+
     vr::Texture_t texture{ (void*)_currentSceneTexture, vr::API_OpenGL, vr::ColorSpace_Auto };
     {
         Lock lock(_mutex);
@@ -174,5 +194,9 @@ void OpenVrDisplayPlugin::internalPresent() {
         });
     }
 
+    if (_enablePreview) {
+        swapBuffers();
+    }
+
     //WindowOpenGLDisplayPlugin::internalPresent();
 }

plugins/openvr/src/OpenVrDisplayPlugin.h

@@ -45,5 +45,7 @@ protected:
 private:
     vr::IVRSystem* _hmd { nullptr };
     static const QString NAME;
+    bool _enablePreview { false };
+    bool _monoPreview { true };
 };
 

plugins/openvr/src/OpenVrHelpers.cpp

@@ -40,6 +40,8 @@ vr::IVRSystem* acquireOpenVrSystem() {
             qCDebug(displayplugins) << "openvr: incrementing refcount";
             ++refCount;
         }
+    } else {
+        qCDebug(displayplugins) << "openvr: no hmd present";
     }
     return activeHmd;
 }

plugins/openvr/src/ViveControllerManager.cpp

@@ -66,10 +66,12 @@ void ViveControllerManager::activate() {
     }
     Q_ASSERT(_hmd);
 
+    // OpenVR provides 3d mesh representations of the controllers
+    // Disabled controller rendering code
+    /*
     auto renderModels = vr::VRRenderModels();
 
     vr::RenderModel_t model;
-    /*
     if (!_hmd->LoadRenderModel(CONTROLLER_MODEL_STRING, &model)) {
         qDebug() << QString("Unable to load render model %1\n").arg(CONTROLLER_MODEL_STRING);
     } else {
@@ -145,6 +147,7 @@ void ViveControllerManager::deactivate() {
 void ViveControllerManager::updateRendering(RenderArgs* args, render::ScenePointer scene, render::PendingChanges pendingChanges) {
     PerformanceTimer perfTimer("ViveControllerManager::updateRendering");
 
+    /*
     if (_modelLoaded) {
         //auto controllerPayload = new render::Payload<ViveControllerManager>(this);
         //auto controllerPayloadPointer = ViveControllerManager::PayloadPointer(controllerPayload);
@@ -175,9 +178,11 @@ void ViveControllerManager::updateRendering(RenderArgs* args, render::ScenePoint
             }
         });
     }
+    */
 }
 
 void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch& batch, int sign) {
+    /*
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
     Transform transform(userInputMapper->getSensorToWorldMat());
     transform.postTranslate(pose.getTranslation() + pose.getRotation() * glm::vec3(0, 0, CONTROLLER_LENGTH_OFFSET));
@@ -199,6 +204,7 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch&
     //    mesh->getVertexBuffer()._stride);
     batch.setIndexBuffer(gpu::UINT16, mesh->getIndexBuffer()._buffer, 0);
     batch.drawIndexed(gpu::TRIANGLES, mesh->getNumIndices(), 0);
+    */
 }