From 296617977ce4121fa5426d8c565841117bb160ab Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 1 Oct 2019 09:14:55 -0700 Subject: [PATCH] get near-grab working with camera-tracked hands --- scripts/system/controllers/controllerDispatcher.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js index d73e5de7e7..24d0e2703d 100644 --- a/scripts/system/controllers/controllerDispatcher.js +++ b/scripts/system/controllers/controllerDispatcher.js @@ -168,16 +168,18 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js"); this.checkForHandTrackingClick = function() { var pinchOnBelowDistance = 0.016; - var pinchOffAboveDistance = 0.04; + var pinchOffAboveDistance = 0.035; var leftIndexPose = Controller.getPoseValue(Controller.Standard.LeftHandIndex4); var leftThumbPose = Controller.getPoseValue(Controller.Standard.LeftHandThumb4); var leftThumbToIndexDistance = Vec3.distance(leftIndexPose.translation, leftThumbPose.translation); if (leftIndexPose.valid && leftThumbPose.valid && leftThumbToIndexDistance < pinchOnBelowDistance) { _this.leftTriggerClicked = 1; + _this.leftTriggerValue = 1; _this.leftTrackerClicked = true; } else if (_this.leftTrackerClicked && leftThumbToIndexDistance > pinchOffAboveDistance) { _this.leftTriggerClicked = 0; + _this.leftTriggerValue = 0; _this.leftTrackerClicked = false; } @@ -186,9 +188,11 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js"); var rightThumbToIndexDistance = Vec3.distance(rightIndexPose.translation, rightThumbPose.translation); if (rightIndexPose.valid && rightThumbPose.valid && rightThumbToIndexDistance < pinchOnBelowDistance) { _this.rightTriggerClicked = 1; + _this.rightTriggerValue = 1; _this.rightTrackerClicked = true; } else if (_this.rightTrackerClicked && rightThumbToIndexDistance > pinchOffAboveDistance) { _this.rightTriggerClicked = 0; + _this.rightTriggerValue = 0; _this.rightTrackerClicked = false; } };