From d8b0fee934880314460036543220ad3b44cee05f Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 3 Aug 2016 13:50:19 -0700
Subject: [PATCH] Fixing color balance, enabling vive controllers

---
 libraries/display-plugins/CMakeLists.txt                    | 2 +-
 .../src/display-plugins/OpenGLDisplayPlugin.cpp             | 2 +-
 .../src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp       | 6 +++++-
 .../src/display-plugins/hmd/HmdDisplayPlugin.h              | 6 +++---
 plugins/openvr/src/ViveControllerManager.cpp                | 1 -
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt
index d1ab0f28c6..315e7510a5 100644
--- a/libraries/display-plugins/CMakeLists.txt
+++ b/libraries/display-plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME display-plugins)
 AUTOSCRIBE_SHADER_LIB(gpu display-plugins)
 setup_hifi_library(OpenGL)
-link_hifi_libraries(shared plugins ui-plugins gl gpu-gl ui)
+link_hifi_libraries(shared plugins ui-plugins gl gpu-gl ui render-utils)
 
 target_opengl()
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 8a5c3c811b..8682ee91b2 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -374,7 +374,7 @@ void OpenGLDisplayPlugin::customizeContext() {
         }
     }
     auto renderSize = getRecommendedRenderSize();
-    _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_SRGBA_32, renderSize.x, renderSize.y));
+    _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, renderSize.x, renderSize.y));
     _compositeTexture = _compositeFramebuffer->getRenderBuffer(0);
 
 }
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
index 8b51baa764..5a34c70c72 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
@@ -78,6 +78,10 @@ bool DebugHmdDisplayPlugin::internalActivate() {
 }
 
 void DebugHmdDisplayPlugin::updatePresentPose() {
+    float yaw = sinf(secTimestampNow()) * 0.25f;
+    float pitch = cosf(secTimestampNow()) * 0.25f;
     // Simulates head pose latency correction
-    _currentPresentFrameInfo.presentPose = glm::mat4_cast(glm::angleAxis(sin(secTimestampNow()) * 0.25f, Vectors::UP)) * glm::mat4_cast(glm::angleAxis(cos(secTimestampNow()) * 0.25f, Vectors::RIGHT));
+    _currentPresentFrameInfo.presentPose = 
+        glm::mat4_cast(glm::angleAxis(yaw, Vectors::UP)) * 
+        glm::mat4_cast(glm::angleAxis(pitch, Vectors::RIGHT));
 }
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index f06677904c..fd490b6b23 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -98,11 +98,11 @@ private:
     bool _enablePreview { false };
     bool _monoPreview { true };
     bool _enableReprojection { true };
-    bool _firstPreview { true };
 
+    // bool _firstPreview { true };
     float _previewAspect { 0 };
-    glm::uvec2 _prevWindowSize { 0, 0 };
-    qreal _prevDevicePixelRatio { 0 };
+    //glm::uvec2 _prevWindowSize { 0, 0 };
+    // qreal _prevDevicePixelRatio { 0 };
 
     struct OverlayRenderer {
         gpu::Stream::FormatPointer format;
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 596f3ab288..bcfc7170dc 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -45,7 +45,6 @@ static const QString RENDER_CONTROLLERS = "Render Hand Controllers";
 const QString ViveControllerManager::NAME = "OpenVR";
 
 bool ViveControllerManager::isSupported() const {
-    return false;
     return openVrSupported();
 }