Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove redundent variable

Browse source
This commit is contained in:
Dante Ruiz 2018-07-30 10:29:53 -07:00
parent 4caf613269
commit 0f46001f9a
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/system/controllers/controllerModules/nearParentGrabEntity.js
View file

@ -12,28 +12,29 @@
findGroupParent, Vec3, cloneEntity, entityIsCloneable, propsAreCloneDynamic, HAPTIC_PULSE_STRENGTH,
HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE, findHandChildEntities, TEAR_AWAY_DISTANCE, MSECS_PER_SEC, TEAR_AWAY_CHECK_TIME,
TEAR_AWAY_COUNT, distanceBetweenPointAndEntityBoundingBox, print, Uuid, highlightTargetEntity, unhighlightTargetEntity,
distanceBetweenEntityLocalPositionAndBoundingBox
distanceBetweenEntityLocalPositionAndBoundingBox, GRAB_POINT_SPHERE_OFFSET
*/
Script.include("/~/system/libraries/controllerDispatcherUtils.js");
Script.include("/~/system/libraries/cloneEntityUtils.js");
Script.include("/~/system/libraries/controllers.js");
(function() {
// 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_IN_JOINT_SPACE = { x: 0.01, y: -0.13, z: 0.039 };
function getGrabPointSphereOffset(handController) {
var offset = GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE;
function getGrabOffset(handController) {
var offset = GRAB_POINT_SPHERE_OFFSET;
if (handController === Controller.Standard.LeftHand) {
offset = {
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
x: -GRAB_POINT_SPHERE_OFFSET.x,
y: GRAB_POINT_SPHERE_OFFSET.y,
z: GRAB_POINT_SPHERE_OFFSET.z
};
}
offset.y = -GRAB_POINT_SPHERE_OFFSET.y;
return Vec3.multiply(MyAvatar.sensorToWorldScale, offset);
}
@ -189,7 +190,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
if (props.parentID === MyAvatar.SELF_ID) {
var tearAwayDistance = TEAR_AWAY_DISTANCE * MyAvatar.sensorToWorldScale;
var controllerIndex = (this.hand === LEFT_HAND ? Controller.Standard.LeftHand : Controller.Standard.RightHand);
var controllerGrabOffset = getGrabPointSphereOffset(controllerIndex);
var controllerGrabOffset = getGrabOffset(controllerIndex);
var distance = distanceBetweenEntityLocalPositionAndBoundingBox(props, controllerGrabOffset);
if (distance > tearAwayDistance) {
this.autoUnequipCounter++;