Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9381 from sethalves/tablet-ui

Browse source 
auto-end a near-grab if the parentID is changed to something else
This commit is contained in:
Seth Alves 2017-01-13 14:23:13 -08:00 committed by GitHub
commit 85104b442f
1 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1157,6 +1157,8 @@ function MyController(hand) {
this.off = function(deltaTime, timestamp) { this.off = function(deltaTime, timestamp) {
this.checkForStrayChildren();
if (this.triggerSmoothedReleased() && this.secondaryReleased()) { if (this.triggerSmoothedReleased() && this.secondaryReleased()) {
this.waitForTriggerRelease = false; this.waitForTriggerRelease = false;
} }
@ -1229,8 +1231,6 @@ function MyController(hand) {
}; };
this.handleStylusOnHomeButton = function(rayPickInfo) { this.handleStylusOnHomeButton = function(rayPickInfo) {
var pointerEvent;
if (rayPickInfo.entityID) { if (rayPickInfo.entityID) {
var entity = rayPickInfo.entityID; var entity = rayPickInfo.entityID;
var name = entityPropertiesCache.getProps(entity).name; var name = entityPropertiesCache.getProps(entity).name;
@ -2017,7 +2017,7 @@ function MyController(hand) {
Entities.editEntity(this.grabbedEntity, { velocity: velocity }); Entities.editEntity(this.grabbedEntity, { velocity: velocity });
} }
} }
} };
this.distanceHolding = function(deltaTime, timestamp) { this.distanceHolding = function(deltaTime, timestamp) {
@ -2232,12 +2232,6 @@ function MyController(hand) {
this.grabbedEntity = saveGrabbedID; this.grabbedEntity = saveGrabbedID;
} }
var otherHandController = this.getOtherHandController();
if (otherHandController.grabbedEntity == this.grabbedEntity &&
(otherHandController.state == STATE_NEAR_GRABBING || otherHandController.state == STATE_DISTANCE_HOLDING)) {
otherHandController.setState(STATE_OFF, "other hand grabbed this entity");
}
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES);
if (FORCE_IGNORE_IK) { if (FORCE_IGNORE_IK) {
this.ignoreIK = true; this.ignoreIK = true;
@ -2323,12 +2317,6 @@ function MyController(hand) {
this.previousParentID = grabbedProperties.parentID; this.previousParentID = grabbedProperties.parentID;
this.previousParentJointIndex = grabbedProperties.parentJointIndex; this.previousParentJointIndex = grabbedProperties.parentJointIndex;
if (grabbedProperties.parentID === MyAvatar.sessionUUID &&
this.getOtherHandController().state == STATE_NEAR_GRABBING) {
// one hand took it from the other
this.previousParentID = NULL_UUID;
this.previousParentJointIndex = -1;
}
Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
action: 'equip', action: 'equip',
@ -2425,7 +2413,7 @@ function MyController(hand) {
this.prevDropDetected = dropDetected; this.prevDropDetected = dropDetected;
} }
var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "parentID", var props = Entities.getEntityProperties(this.grabbedEntity, ["localPosition", "parentID", "parentJointIndex",
"position", "rotation", "dimensions", "position", "rotation", "dimensions",
"registrationPoint"]); "registrationPoint"]);
if (!props.position) { if (!props.position) {
@ -2436,6 +2424,16 @@ function MyController(hand) {
return; return;
} }
if (this.state == STATE_NEAR_GRABBING && this.actionID === null && !this.thisHandIsParent(props)) {
// someone took it from us or otherwise edited the parentID. end the grab. We don't do this
// for equipped things so that they can be adjusted while equipped.
this.callEntityMethodOnGrabbed("releaseGrab");
this.grabbedEntity = null;
this.release();
this.setState(STATE_OFF, "someone took it");
return;
}
var now = Date.now(); var now = Date.now();
if (this.state == STATE_HOLD && now - this.lastUnequipCheckTime > MSECS_PER_SEC * CHECK_TOO_FAR_UNEQUIP_TIME) { if (this.state == STATE_HOLD && now - this.lastUnequipCheckTime > MSECS_PER_SEC * CHECK_TOO_FAR_UNEQUIP_TIME) {
this.lastUnequipCheckTime = now; this.lastUnequipCheckTime = now;
@ -2880,7 +2878,6 @@ function MyController(hand) {
} else { } else {
// no action, so it's a parenting grab // no action, so it's a parenting grab
if (this.previousParentID === NULL_UUID) { if (this.previousParentID === NULL_UUID) {
var velocity = Entities.getEntityProperties(this.grabbedEntity, ["velocity"]).velocity;
Entities.editEntity(this.grabbedEntity, { Entities.editEntity(this.grabbedEntity, {
parentID: this.previousParentID, parentID: this.previousParentID,
parentJointIndex: this.previousParentJointIndex parentJointIndex: this.previousParentJointIndex
@ -2919,7 +2916,28 @@ function MyController(hand) {
this.grabPointSphereOff(); this.grabPointSphereOff();
}; };
this.thisHandIsParent = function(props) {
if (props.parentID != MyAvatar.sessionUUID) {
return false;
}
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
if (props.parentJointIndex == handJointIndex) {
return true;
}
var controllerJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND");
if (props.parentJointIndex == controllerJointIndex) {
return true;
}
return false;
};
this.checkForStrayChildren = function() { this.checkForStrayChildren = function() {
var _this = this;
// sometimes things can get parented to a hand and this script is unaware. Search for such entities and // sometimes things can get parented to a hand and this script is unaware. Search for such entities and
// unhook them. // unhook them.
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"); var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
@ -2927,7 +2945,7 @@ function MyController(hand) {
var controllerJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? var controllerJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
"_CONTROLLER_RIGHTHAND" : "_CONTROLLER_RIGHTHAND" :
"_CONTROLLER_LEFTHAND"); "_CONTROLLER_LEFTHAND");
children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerJointIndex)); children = 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, {