From 4caf613269a25c800c754fdde3180be7a87e4050 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 30 Jul 2018 10:19:27 -0700 Subject: [PATCH] making requested changes --- .../controllerModules/nearParentGrabEntity.js | 10 +++++----- scripts/system/libraries/controllerDispatcherUtils.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js index c26285cdcc..7d22e3b232 100644 --- a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js +++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js @@ -23,15 +23,15 @@ Script.include("/~/system/libraries/cloneEntityUtils.js"); // XXX this.ignoreIK = (grabbableData.ignoreIK !== undefined) ? grabbableData.ignoreIK : true; // XXX this.kinematicGrab = (grabbableData.kinematic !== undefined) ? grabbableData.kinematic : NEAR_GRABBING_KINEMATIC; - var GRAB_POINT_SPHERE_OFFSET = { x: 0.01, y: -0.13, z: 0.039 }; + var GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE = { x: 0.01, y: -0.13, z: 0.039 }; function getGrabPointSphereOffset(handController) { - var offset = GRAB_POINT_SPHERE_OFFSET; + var offset = GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE; if (handController === Controller.Standard.LeftHand) { offset = { - x: -GRAB_POINT_SPHERE_OFFSET.x, - y: GRAB_POINT_SPHERE_OFFSET.y, - z: GRAB_POINT_SPHERE_OFFSET.z + x: -GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.x, + y: GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.y, + z: GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.z }; } return Vec3.multiply(MyAvatar.sensorToWorldScale, offset); diff --git a/scripts/system/libraries/controllerDispatcherUtils.js b/scripts/system/libraries/controllerDispatcherUtils.js index c562c9294b..60c4553da7 100644 --- a/scripts/system/libraries/controllerDispatcherUtils.js +++ b/scripts/system/libraries/controllerDispatcherUtils.js @@ -95,7 +95,7 @@ COLORS_GRAB_DISTANCE_HOLD = { red: 238, green: 75, blue: 214 }; NEAR_GRAB_RADIUS = 1.0; -TEAR_AWAY_DISTANCE = 0.2; // ungrab an entity if its bounding-box moves this far from the hand +TEAR_AWAY_DISTANCE = 0.15; // ungrab an entity if its bounding-box moves this far from the hand TEAR_AWAY_COUNT = 2; // multiply by TEAR_AWAY_CHECK_TIME to know how long the item must be away TEAR_AWAY_CHECK_TIME = 0.15; // seconds, duration between checks DISPATCHER_HOVERING_LIST = "dispactherHoveringList";