From d61f4fbb253d995fa1e83c86e1fa3a1b17b8e38c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 16 Feb 2016 16:26:17 -0800
Subject: [PATCH] PR feedback

---
 .../display-plugins/hmd/HmdDisplayPlugin.cpp  | 35 +------------------
 plugins/openvr/src/OpenVrDisplayPlugin.cpp    |  3 ++
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 0ae7548098..7b96987348 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -15,9 +15,7 @@
 
 #include <GLMHelpers.h>
 #include <plugins/PluginContainer.h>
-
-Q_DECLARE_LOGGING_CATEGORY(displayplugins)
-Q_LOGGING_CATEGORY(displayplugins, "hifi.displayplugins")
+#include "../Logging.h"
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate";
@@ -87,34 +85,3 @@ void HmdDisplayPlugin::internalPresent() {
         swapBuffers();
     }
 }
-
-
-//// screen preview mirroring
-//if (_enablePreview) {
-//    auto windowSize = toGlm(_window->size());
-//    if (_monoPreview) {
-//        // Find the aspect ratio for one eye
-//        auto eyeAspect = (float)(size.x / 2) / (float)size.y;
-//        auto windowAspect = (float)windowSize.x / (float)windowSize.y;
-//        if (eyeAspect < windowAspect) {
-//            Context::Viewport(windowSize.x * 2, windowSize.y);
-//            Context::Scissor(0, windowSize.y, windowSize.x, windowSize.y);
-//        } else {
-//
-//        }
-//    } else {
-//        Context::Viewport(windowSize.x, windowSize.y);
-//    }
-//    glBindTexture(GL_TEXTURE_2D, _currentSceneTexture);
-//    GLenum err = glGetError();
-//    Q_ASSERT(0 == err);
-//    drawUnitQuad();
-//}
-///*
-//The swapbuffer call here is only required if we want to mirror the content to the screen.
-//However, it should only be done if we can reliably disable v-sync on the mirror surface,
-//otherwise the swapbuffer delay will interefere with the framerate of the headset
-//*/
-//if (_enablePreview) {
-//    swapBuffers();
-//}
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index fa75f4a0c9..24607fd73d 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -59,6 +59,9 @@ void OpenVrDisplayPlugin::activate() {
             _eyeOffsets[eye] = toGlm(_hmd->GetEyeToHeadTransform(eye));
             _eyeProjections[eye] = toGlm(_hmd->GetProjectionMatrix(eye, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, vr::API_OpenGL));
         });
+        // FIXME Calculate the proper combined projection by using GetProjectionRaw values from both eyes
+        _cullingProjection = _eyeProjections[0];
+
     }
 
     _compositor = vr::VRCompositor();