Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 18:15:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ignoreIK for equipping. change how auto-unequip searches

Browse source
This commit is contained in:
Seth Alves 2016-08-30 11:16:13 -07:00
parent 2a9ffc1529
commit 3a5f92d7a2
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/system/controllers/handControllerGrab.js
View file

@ -1926,7 +1926,15 @@ function MyController(hand) {
} else { } else {
// grab entity via parenting // grab entity via parenting
this.actionID = null; this.actionID = null;
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"); var handJointIndex;
if (this.ignoreIK) {
handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
} else {
handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
}
var reparentProps = { var reparentProps = {
parentID: MyAvatar.sessionUUID, parentID: MyAvatar.sessionUUID,
parentJointIndex: handJointIndex, parentJointIndex: handJointIndex,
@ -2043,11 +2051,23 @@ function MyController(hand) {
this.lastUnequipCheckTime = now; this.lastUnequipCheckTime = now;
if (props.parentID == MyAvatar.sessionUUID) { if (props.parentID == MyAvatar.sessionUUID) {
var handPosition = this.getHandPosition(); var heldItemPosition;
var heldItemRotation;
if (this.ignoreIK) {
var heldItemLocation = this.getControllerLocation();
heldItemPosition = heldItemLocation.position;
heldItemRotation = heldItemLocation.orientation;
} else {
heldItemPosition = this.getHandPosition();
heldItemRotation = this.getHandRotation();
}
heldItemPosition = Vec3.sum(heldItemPosition, Vec3.multiplyQbyV(heldItemRotation, this.offsetPosition));
// the center of the equipped object being far from the hand isn't enough to auto-unequip -- we also // the center of the equipped object being far from the hand isn't enough to auto-unequip -- we also
// need to fail the findEntities test. // need to fail the findEntities test.
var TEAR_AWAY_DISTANCE = 0.04; var TEAR_AWAY_DISTANCE = 0.04;
var nearPickedCandidateEntities = Entities.findEntities(handPosition, NEAR_GRAB_RADIUS + TEAR_AWAY_DISTANCE); var nearPickedCandidateEntities = Entities.findEntities(heldItemPosition, NEAR_GRAB_RADIUS + TEAR_AWAY_DISTANCE);
if (nearPickedCandidateEntities.indexOf(this.grabbedEntity) == -1) { if (nearPickedCandidateEntities.indexOf(this.grabbedEntity) == -1) {
// for whatever reason, the held/equipped entity has been pulled away. ungrab or unequip. // for whatever reason, the held/equipped entity has been pulled away. ungrab or unequip.
print("handControllerGrab -- autoreleasing held or equipped item because it is far from hand." + print("handControllerGrab -- autoreleasing held or equipped item because it is far from hand." +
@ -2429,6 +2449,10 @@ function MyController(hand) {
// unhook them. // unhook them.
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"); var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
var children = Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, handJointIndex); var children = Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, handJointIndex);
var controllerJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerJointIndex));
children.forEach(function(childID) { children.forEach(function(childID) {
print("disconnecting stray child of hand: (" + _this.hand + ") " + childID); print("disconnecting stray child of hand: (" + _this.hand + ") " + childID);
Entities.editEntity(childID, { Entities.editEntity(childID, {