From e22c36b4b7800eae88cf7b081be0d673f1931a7c Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Mon, 7 Nov 2016 17:16:24 +0000
Subject: [PATCH] fixed menu pop up delay

---
 interface/resources/controllers/xbox.json     | 30 +++++++++----------
 .../controllers/handControllerPointer.js      | 18 +++++------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json
index b0e97b849f..36065b87a1 100644
--- a/interface/resources/controllers/xbox.json
+++ b/interface/resources/controllers/xbox.json
@@ -4,12 +4,12 @@
         { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateZ" },
         { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateX" },
 
-        { "from": "GamePad.LT", "to": "Standard.LTClick",  
+        { "from": "GamePad.LT", "to": "Standard.LTClick",
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
         },
-        { "from": "GamePad.LT", "to": "Standard.LT" }, 
-        { "from": "GamePad.LB", "to": "Standard.LB" }, 
+        { "from": "GamePad.LT", "to": "Standard.LT" },
+        { "from": "GamePad.LB", "to": "Standard.LB" },
         { "from": "GamePad.LS", "to": "Standard.LS" },
 
 
@@ -27,34 +27,34 @@
 
         { "from": "GamePad.RX", "to": "Actions.Yaw" },
 
-        { "from": "GamePad.RY", 
-          "to": "Actions.VERTICAL_UP", 
-          "filters": 
+        { "from": "GamePad.RY",
+          "to": "Actions.VERTICAL_UP",
+          "filters":
             [
                 { "type": "deadZone", "min": 0.95 },
                 "invert"
             ]
-        }, 
+        },
 
-        { "from": "GamePad.RT", "to": "Standard.RTClick",  
+        { "from": "GamePad.RT", "to": "Standard.RTClick",
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
         },
-        { "from": "GamePad.RT", "to": "Standard.RT" }, 
-        { "from": "GamePad.RB", "to": "Standard.RB" }, 
+        { "from": "GamePad.RT", "to": "Standard.RT" },
+        { "from": "GamePad.RB", "to": "Standard.RB" },
         { "from": "GamePad.RS", "to": "Standard.RS" },
 
         { "from": "GamePad.Start", "to": "Actions.CycleCamera" },
-        { "from": "GamePad.Back", "to": "Actions.ContextMenu" },
+        { "from": "GamePad.Back", "to": "Standard.Start" },
 
         { "from": "GamePad.DU", "to": "Standard.DU" },
-        { "from": "GamePad.DD", "to": "Standard.DD" }, 
+        { "from": "GamePad.DD", "to": "Standard.DD" },
         { "from": "GamePad.DL", "to": "Standard.DL" },
-        { "from": "GamePad.DR", "to": "Standard.DR" }, 
+        { "from": "GamePad.DR", "to": "Standard.DR" },
 
         { "from": [ "GamePad.Y" ], "to": "Standard.RightPrimaryThumb", "peek": true },
-        { "from": "GamePad.A", "to": "Standard.A" }, 
-        { "from": "GamePad.B", "to": "Standard.B" }, 
+        { "from": "GamePad.A", "to": "Standard.A" },
+        { "from": "GamePad.B", "to": "Standard.B" },
         { "from": "GamePad.X", "to": "Standard.X" },
         { "from": "GamePad.Y", "to": "Standard.Y" }
     ]
diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js
index 82344426cb..ce9b8e403f 100644
--- a/scripts/system/controllers/handControllerPointer.js
+++ b/scripts/system/controllers/handControllerPointer.js
@@ -203,6 +203,7 @@ function overlayFromWorldPoint(point) {
     return { x: horizontalPixels, y: verticalPixels };
 }
 
+var gamePad = Controller.findDevice("GamePad");
 function activeHudPoint2dGamePad() {
     if (!HMD.active) {
       return;
@@ -227,13 +228,10 @@ function activeHudPoint2dGamePad() {
     return hudPoint2d;
 }
 
-var gamePad = Controller.findDevice("GamePad");
+
 function activeHudPoint2d(activeHand) { // if controller is valid, update reticle position and answer 2d point. Otherwise falsey.
     var controllerPose = getControllerWorldLocation(activeHand, true); // note: this will return head pose if hand pose is invalid (third eye)
     if (!controllerPose.valid) {
-        if (gamePad) {
-          return activeHudPoint2dGamePad();
-        }
         return; // Controller is cradled.
     }
     var controllerPosition = controllerPose.position;
@@ -448,12 +446,12 @@ clickMapping.from(Controller.Standard.LeftSecondaryThumb).peek().to(function (cl
     }
     wantsMenu = clicked;
 });
-clickMapping.from(Controller.Hardware.GamePad.Back).peek().to(function () {
-    // Wait a tick an allow the reticle to be correctly set to the players look at position before invoking
-    // ContextMenu action
-    Script.setTimeout(function () {
-      activeHudPoint2dGamePad();
-    }, 0);
+clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) {
+    if (clicked) {
+        activeHudPoint2dGamePad();
+      }
+
+      wantsMenu = clicked;
 });
 clickMapping.from(Controller.Hardware.Keyboard.RightMouseClicked).peek().to(function () {
     // Allow the reticle depth to be set correctly: