Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 12:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

making requested changes

Browse source
This commit is contained in:
Dante Ruiz 2018-07-30 10:19:27 -07:00
parent cf6850de48
commit 4caf613269
2 changed files with 6 additions and 6 deletions
scripts/system
controllers/controllerModules
nearParentGrabEntity.js
libraries
controllerDispatcherUtils.js

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

@ -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);

2
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -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";