From 79d09f68fdecb89aadc5d9632f61dd0d7f4ed741 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Thu, 18 Jul 2019 12:54:36 -0700
Subject: [PATCH] Disable grab.js picks when in HMD

---
 scripts/system/controllers/grab.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js
index 1fb82d3843..2cab0cbf25 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -221,6 +221,20 @@ function Grabber() {
     });
 }
 
+Grabber.prototype.setPicksEnabled = function(enabled) {
+    if (enabled) {
+        Picks.enablePick(this.mouseRayOverlays);
+        Pointers.enablePointer(this.mouseRayEntities);
+    } else {
+        Picks.disablePick(this.mouseRayOverlays);
+        Pointers.disablePointer(this.mouseRayEntities);
+    }
+}
+
+Grabber.prototype.displayModeChanged = function(isHMDMode) {
+    this.setPicksEnabled(!isHMDMode);
+}
+
 Grabber.prototype.computeNewGrabPlane = function() {
     if (!this.isGrabbing) {
         return;
@@ -488,6 +502,10 @@ Grabber.prototype.cleanup = function() {
 
 var grabber = new Grabber();
 
+function displayModeChanged(isHMDMode) {
+    grabber.displayModeChanged(isHMDMode);
+}
+
 function pressEvent(event) {
     grabber.pressEvent(event);
 }
@@ -517,6 +535,7 @@ Controller.mouseMoveEvent.connect(moveEvent);
 Controller.mouseReleaseEvent.connect(releaseEvent);
 Controller.keyPressEvent.connect(keyPressEvent);
 Controller.keyReleaseEvent.connect(keyReleaseEvent);
+HMD.displayModeChanged.connect(displayModeChanged);
 Script.scriptEnding.connect(cleanup);
 
 }()); // END LOCAL_SCOPE