From 42e7c5278c5efaf3a7b502cf91c92e39e6cc160a Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Wed, 29 Jul 2015 16:04:57 -0700
Subject: [PATCH 1/2] attempt to fix ray picking in standing mode

---
 interface/src/ui/ApplicationCompositor.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp
index 8e6b9c4781..7033d577d9 100644
--- a/interface/src/ui/ApplicationCompositor.cpp
+++ b/interface/src/ui/ApplicationCompositor.cpp
@@ -365,8 +365,13 @@ void ApplicationCompositor::computeHmdPickRay(glm::vec2 cursorPos, glm::vec3& or
 
     // We need the RAW camera orientation and position, because this is what the overlay is
     // rendered relative to
-    const glm::vec3 overlayPosition = qApp->getCamera()->getPosition();
-    const glm::quat overlayOrientation = qApp->getCamera()->getRotation();
+    glm::vec3 overlayPosition = qApp->getCamera()->getPosition();
+    glm::quat overlayOrientation = qApp->getCamera()->getRotation();
+
+    if (Menu::getInstance()->isOptionChecked(MenuOption::StandingHMDSensorMode)) {
+        overlayPosition = _modelTransform.getTranslation();
+        overlayOrientation = _modelTransform.getRotation();
+    }
 
     // Intersection UI overlay space
     glm::vec3 worldSpaceDirection = overlayOrientation * overlaySpaceDirection;

From 9025bc3eadf923d83e4e0245f531f2ac7ca3cda7 Mon Sep 17 00:00:00 2001
From: Sam Gondelman <samuel_gondelman@brown.edu>
Date: Wed, 29 Jul 2015 16:43:25 -0700
Subject: [PATCH 2/2] press o to toggle overlays in case you don't have a
 middle mouse click

---
 interface/src/Application.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5da834ee75..c817a9bcbf 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1531,6 +1531,9 @@ void Application::keyPressEvent(QKeyEvent* event) {
                  Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson));
                  cameraMenuChanged();
                  break;
+            case Qt::Key_O:
+                _overlayConductor.setEnabled(!_overlayConductor.getEnabled());
+                break;
             case Qt::Key_Slash:
                 Menu::getInstance()->triggerOption(MenuOption::Stats);
                 break;