From 58906d84eb10c85cdbcc54bd12aa8e6c3bc9a7c5 Mon Sep 17 00:00:00 2001 From: r3tk0n Date: Thu, 21 Feb 2019 15:22:21 -0800 Subject: [PATCH] Add grip button polling. --- .../controllerModules/farGrabEntity.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/system/controllers/controllerModules/farGrabEntity.js b/scripts/system/controllers/controllerModules/farGrabEntity.js index e9e7068206..9c78c576d5 100644 --- a/scripts/system/controllers/controllerModules/farGrabEntity.js +++ b/scripts/system/controllers/controllerModules/farGrabEntity.js @@ -328,6 +328,8 @@ Script.include("/~/system/libraries/controllers.js"); grabMapping = Controller.newMapping(mappingName); grabMapping.from(Controller.Standard.LT).peek().to(_this.getLeftTrigger); grabMapping.from(Controller.Standard.RT).peek().to(_this.getRightTrigger); + grabMapping.from(Controller.Standard.LeftGrip).peek().to(_this.setLeftGrip); + grabMapping.from(Controller.Standard.RightGrip).peek().to(_this.setRightGrip); Controller.enableMapping(mappingName); }; @@ -337,6 +339,8 @@ Script.include("/~/system/libraries/controllers.js"); this.leftTrigger = 0.0; this.rightTrigger = 0.0; + this.leftGrip = 0.0; + this.rightGrip = 0.0; this.getDominantHand = function () { return (MyAvatar.getDominantHand() === "left") ? LEFT_HAND : RIGHT_HAND; @@ -362,6 +366,22 @@ Script.include("/~/system/libraries/controllers.js"); return (MyAvatar.getDominantHand() === "left") ? (_this.rightTrigger) : (_this.leftTrigger); }; + this.setLeftGrip = function (value) { + this.leftGrip = value; + } + + this.setRightGrip = function (value) { + this.rightGrip = value; + } + + this.getDominantGrip = function () { + return (MyAvatar.getDominantHand() === "left" ? (_this.leftGrip) : (_this.rightGrip)); + } + + this.getOffhandGrip = function () { + return (MyAvatar.getDominantHand() === "left" ? (_this.rightGrip) : (_this.leftGrip)); + } + this.shouldShowLaser = function () { return (_this.getOffHandTrigger() > TRIGGER_ON_VALUE) ? true : false; };