From 250d0717884008c993c6ee7317df21e387ad0aad Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Mon, 19 Dec 2016 17:05:34 -0800 Subject: [PATCH] grip squeezes fingers too --- scripts/system/controllers/squeezeHands.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/system/controllers/squeezeHands.js b/scripts/system/controllers/squeezeHands.js index f06529f2b2..1e94c29521 100644 --- a/scripts/system/controllers/squeezeHands.js +++ b/scripts/system/controllers/squeezeHands.js @@ -53,9 +53,9 @@ function animStateHandler(props) { } function update(dt) { - var leftTrigger = normalizeControllerValue(Controller.getValue(Controller.Standard.LT)); - var rightTrigger = normalizeControllerValue(Controller.getValue(Controller.Standard.RT)); - + var leftTrigger = clamp(Controller.getValue(Controller.Standard.LT) + Controller.getValue(Controller.Standard.LeftGrip), 0, 1); + var rightTrigger = clamp(Controller.getValue(Controller.Standard.RT) + Controller.getValue(Controller.Standard.RightGrip), 0, 1); + // Average last few trigger values together for a bit of smoothing var tau = clamp(dt / TRIGGER_SMOOTH_TIMESCALE, 0, 1); lastLeftTrigger = lerp(leftTrigger, lastLeftTrigger, tau);