Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert back to the old way we checkForChildTooFarAway

Browse source
This commit is contained in:
Dante Ruiz 2018-07-26 15:23:54 -07:00
parent 21d043d179
commit 6edd109dfe
2 changed files with 2 additions and 21 deletions
scripts/system
controllers/controllerModules
nearParentGrabEntity.js
libraries
controllerDispatcherUtils.js

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

@ -22,7 +22,7 @@ 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;
Script.include("/~/system/libraries/controllers");
function NearParentingGrabEntity(hand) {
this.hand = hand;
this.targetEntityID = null;
@ -174,7 +174,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
this.lastUnequipCheckTime = now;
if (props.parentID === MyAvatar.SELF_ID) {
var tearAwayDistance = TEAR_AWAY_DISTANCE * MyAvatar.sensorToWorldScale;
var distance = distanceBetweenEntityLocalPositionAndBoundingBox(props);
var distance = distanceBetweenPointAndEntityBoundingBox(props);
if (distance > tearAwayDistance) {
this.autoUnequipCounter++;
} else {

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

@ -416,25 +416,6 @@ findHandChildEntities = function(hand) {
});
};
distanceBetweenEntityLocalPositionAndBoundingBox = function(entityProps) {
var localPoint = entityProps.localPosition;
var entityXform = new Xform(entityProps.rotation, entityProps.position);
var minOffset = Vec3.multiplyVbyV(entityProps.registrationPoint, entityProps.dimensions);
var maxOffset = Vec3.multiplyVbyV(Vec3.subtract(ONE_VEC, entityProps.registrationPoint), entityProps.dimensions);
var localMin = Vec3.subtract(entityXform.trans, minOffset);
var localMax = Vec3.sum(entityXform.trans, maxOffset);
var v = {x: localPoint.x, y: localPoint.y, z: localPoint.z};
v.x = Math.max(v.x, localMin.x);
v.x = Math.min(v.x, localMax.x);
v.y = Math.max(v.y, localMin.y);
v.y = Math.min(v.y, localMax.y);
v.z = Math.max(v.z, localMin.z);
v.z = Math.min(v.z, localMax.z);
return Vec3.distance(v, localPoint);
};
distanceBetweenPointAndEntityBoundingBox = function(point, entityProps) {
var entityXform = new Xform(entityProps.rotation, entityProps.position);
var localPoint = entityXform.inv().xformPoint(point);