switching near grab priority to be before web surface laser

scripts/system/controllers/controllerModules/highlightNearbyEntities.js

@@ -37,7 +37,7 @@
         this.highlightedEntities = [];
 
         this.parameters = dispatcherUtils.makeDispatcherModuleParameters(
-            480,
+            120,
             this.hand === dispatcherUtils.RIGHT_HAND ? ["rightHand"] : ["leftHand"],
             [],
             100);

scripts/system/controllers/controllerModules/inEditMode.js

@@ -30,7 +30,7 @@ Script.include("/~/system/libraries/utils.js");
         this.reticleMaxY;
 
         this.parameters = makeDispatcherModuleParameters(
-            160,
+            200,
             this.hand === RIGHT_HAND ? ["rightHand", "rightHandEquip", "rightHandTrigger"] : ["leftHand", "leftHandEquip", "leftHandTrigger"],
             [],
             100,

scripts/system/controllers/controllerModules/inVREditMode.js

@@ -21,7 +21,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         this.disableModules = false;
         var NO_HAND_LASER = -1; // Invalid hand parameter so that default laser is not displayed.
         this.parameters = makeDispatcherModuleParameters(
-            200, // Not too high otherwise the tablet laser doesn't work.
+            240, // Not too high otherwise the tablet laser doesn't work.
             this.hand === RIGHT_HAND
                 ? ["rightHand", "rightHandEquip", "rightHandTrigger"]
                 : ["leftHand", "leftHandEquip", "leftHandTrigger"],

scripts/system/controllers/controllerModules/nearActionGrabEntity.js

@@ -26,7 +26,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
         this.hapticTargetID = null;
 
         this.parameters = makeDispatcherModuleParameters(
-            500,
+            140,
             this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
             [],
             100);

scripts/system/controllers/controllerModules/nearGrabHyperLinkEntity.js

@@ -21,7 +21,7 @@
         this.hyperlink = "";
 
         this.parameters = makeDispatcherModuleParameters(
-            485,
+            125,
             this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
             [],
             100);

scripts/system/controllers/controllerModules/nearParentGrabEntity.js

@@ -39,7 +39,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
         this.cloneAllowed = true;
 
         this.parameters = makeDispatcherModuleParameters(
-            500,
+            140,
             this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
             [],
             100);

scripts/system/controllers/controllerModules/nearTrigger.js

@@ -29,7 +29,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         this.startSent = false;
 
         this.parameters = makeDispatcherModuleParameters(
-            480,
+            120,
             this.hand === RIGHT_HAND ? ["rightHandTrigger", "rightHand"] : ["leftHandTrigger", "leftHand"],
             [],
             100);

scripts/system/controllers/controllerModules/webSurfaceLaserInput.js

@@ -22,7 +22,7 @@ Script.include("/~/system/libraries/controllers.js");
         this.running = false;
 
         this.parameters = makeDispatcherModuleParameters(
-            120,
+            160,
             this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
             [],
             100,
@@ -60,6 +60,30 @@ Script.include("/~/system/libraries/controllers.js");
             return this.hand === RIGHT_HAND ? leftOverlayLaserInput : rightOverlayLaserInput;
         };
 
+        this.isPointingAtGrabbableEntity = function(controllerData, triggerPressed) {
+            // we are searching for an entity that is not a web entity.  We want to be able to
+            // grab a non-web entity if the ray-pick intersects one.
+            var intersection = controllerData.rayPicks[this.hand];
+            if(intersection.type === Picks.INTERSECTED_ENTITY) {
+                // is pointing at an entity.
+                var entityProperty = Entities.getEntityProperties(intersection.objectID);
+                var entityType = entityProperty.type;
+                var isGrabbable = entityIsGrabbable(entityProperty);
+                return (isGrabbable && triggerPressed && entityType !== "Web");
+            } else if (intersection.type === Picks.INTERSECTED_OVERLAY) {
+                var objectID = intersection.objectID;
+                if ((HMD.tabletID && objectID === HMD.tabletID) ||
+                    (HMD.tabletScreenID && objectID === HMD.tabletScreenID) || 
+                    (HMD.homeButtonID && objectID === HMD.homeButtonID)) {
+                    return true;
+                } else {
+                    var overlayType = Overlays.getOverlayType(objectID);
+                    return overlayType === "web3d" || triggerPressed;
+                }
+            }
+            return false;
+        }
+
         this.isPointingAtTriggerable = function(controllerData, triggerPressed) {
             // allow pointing at tablet, unlocked web entities, or web overlays automatically without pressing trigger,
             // but for pointing at locked web entities or non-web overlays user must be pressing trigger
@@ -113,7 +137,8 @@ Script.include("/~/system/libraries/controllers.js");
             var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE &&
                                    controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
             var allowThisModule = !otherModuleRunning || isTriggerPressed;
-            if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) {
+            if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) { 
+                //this.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) {
                 this.updateAllwaysOn();
                 if (isTriggerPressed) {
                     this.dominantHandOverride = true; // Override dominant hand.
@@ -134,7 +159,8 @@ Script.include("/~/system/libraries/controllers.js");
             var allowThisModule = !otherModuleRunning && !grabModuleNeedsToRun;
             var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE;
             var laserOn = isTriggerPressed || this.parameters.handLaser.allwaysOn;
-            if (allowThisModule && (laserOn && this.isPointingAtTriggerable(controllerData, isTriggerPressed))) {
+            if (allowThisModule && (laserOn && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) && 
+                this.isPointingAtGrabbableEntity(controllerData, isTriggerPressed)) {
                 this.running = true;
                 return makeRunningValues(true, [], []);
             }