From 39e3deb9b950e0976c33fc9deca50b441daa695f Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 10 Jun 2014 15:03:07 -0700
Subject: [PATCH] Add menu item that toggles VR display mode

Toggles the display mode if a Rift is found connected at program start.
---
 interface/src/Application.cpp           | 3 +++
 interface/src/Application.h             | 1 +
 interface/src/Menu.cpp                  | 5 +++++
 interface/src/Menu.h                    | 1 +
 interface/src/devices/OculusManager.cpp | 8 ++++++++
 interface/src/devices/OculusManager.h   | 2 +-
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3cfec3190e..3075d6ccaf 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1369,6 +1369,9 @@ void Application::setEnable3DTVMode(bool enable3DTVMode) {
     resizeGL(_glWidget->width(),_glWidget->height());
 }
 
+void Application::setEnableVRMode(bool enableVRMode) {
+    resizeGL(_glWidget->width(), _glWidget->height());
+}
 
 void Application::setRenderVoxels(bool voxelRender) {
     _voxelEditSender.setShouldSend(voxelRender);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 170be43493..f164c28be1 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -345,6 +345,7 @@ private slots:
 
     void setFullscreen(bool fullscreen);
     void setEnable3DTVMode(bool enable3DTVMode);
+    void setEnableVRMode(bool enableVRMode);
     void cameraMenuChanged();
 
     glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index f791d20588..d59a4b23e1 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -253,6 +253,11 @@ Menu::Menu() :
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror, Qt::Key_H, false,
                                             appInstance, SLOT(cameraMenuChanged()));
 
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::EnableVRMode, 0,
+                                           false,
+                                           appInstance,
+                                           SLOT(setEnableVRMode(bool)));
+
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Enable3DTVMode, 0,
                                            false,
                                            appInstance,
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 69015a938b..b39aefb0ba 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -334,6 +334,7 @@ namespace MenuOption {
     const QString EchoLocalAudio = "Echo Local Audio";
     const QString EchoServerAudio = "Echo Server Audio";
     const QString Enable3DTVMode = "Enable 3DTV Mode";
+    const QString EnableVRMode = "Enable VR Mode";
     const QString ExpandMiscAvatarTiming = "Expand Misc MyAvatar Timing";
     const QString ExpandAvatarUpdateTiming = "Expand MyAvatar update Timing";
     const QString ExpandAvatarSimulateTiming = "Expand MyAvatar simulate Timing";
diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index fe8cc37168..b2ee4e8c18 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -72,6 +72,14 @@ void OculusManager::connect() {
 #endif
 }
 
+bool OculusManager::isConnected() {
+#ifdef HAVE_LIBOVR
+    return _isConnected && Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode);
+#else
+    return false;
+#endif
+}
+
 void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenHeight) {
 #ifdef HAVE_LIBOVR
     _stereoConfig.SetFullViewport(Viewport(0, 0, screenWidth, screenHeight));
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index 6376df05ca..caff38a6b0 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -27,7 +27,7 @@ class OculusManager {
 public:
     static void connect();
     
-    static bool isConnected() { return _isConnected; }
+    static bool isConnected();
     
     static void configureCamera(Camera& camera, int screenWidth, int screenHeight);