Merge pull request #3019 from ctrlaltdavid/19769

Code Review for Job #19769

interface/src/Application.cpp

@@ -1379,6 +1379,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);

interface/src/Application.h

@@ -346,6 +346,7 @@ private slots:
 
     void setFullscreen(bool fullscreen);
     void setEnable3DTVMode(bool enable3DTVMode);
+    void setEnableVRMode(bool enableVRMode);
     void cameraMenuChanged();
 
     glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);

interface/src/Menu.cpp

@@ -254,6 +254,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,

interface/src/Menu.h

@@ -336,6 +336,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";

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));

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);