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

fix releaseGrab call on grabbed entity when a nearGrab ends

Browse source
This commit is contained in:
Seth Alves 2019-01-16 15:31:04 -08:00 committed by Andrew Meadows
parent 2bf7ac2745
commit c8e9bff03a
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@
Entities, enableDispatcherModule, disableDispatcherModule, entityIsGrabbable, makeDispatcherModuleParameters, MSECS_PER_SEC, Entities, enableDispatcherModule, disableDispatcherModule, entityIsGrabbable, makeDispatcherModuleParameters, MSECS_PER_SEC,
HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC,
projectOntoEntityXYPlane, ContextOverlay, HMD, Picks, makeLaserLockInfo, makeLaserParams, AddressManager, projectOntoEntityXYPlane, ContextOverlay, HMD, Picks, makeLaserLockInfo, makeLaserParams, AddressManager,
getEntityParents, Selection, DISPATCHER_HOVERING_LIST, unhighlightTargetEntity, Messages, findGroupParent, getEntityParents, Selection, DISPATCHER_HOVERING_LIST, unhighlightTargetEntity, Messages, findGrabbableGroupParent,
worldPositionToRegistrationFrameMatrix, DISPATCHER_PROPERTIES worldPositionToRegistrationFrameMatrix, DISPATCHER_PROPERTIES
*/ */
@ -308,7 +308,7 @@ Script.include("/~/system/libraries/controllers.js");
var gtProps = Entities.getEntityProperties(targetEntity, DISPATCHER_PROPERTIES); var gtProps = Entities.getEntityProperties(targetEntity, DISPATCHER_PROPERTIES);
if (entityIsGrabbable(gtProps)) { if (entityIsGrabbable(gtProps)) {
// if we've attempted to grab a child, roll up to the root of the tree // if we've attempted to grab a child, roll up to the root of the tree
var groupRootProps = findGroupParent(controllerData, gtProps); var groupRootProps = findGrabbableGroupParent(controllerData, gtProps);
if (entityIsGrabbable(groupRootProps)) { if (entityIsGrabbable(groupRootProps)) {
return groupRootProps; return groupRootProps;
} }

15
scripts/system/controllers/controllerModules/nearGrabEntity.js
View file

@ -8,9 +8,10 @@
/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND, getControllerJointIndex, enableDispatcherModule, /* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND, getControllerJointIndex, enableDispatcherModule,
disableDispatcherModule, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, TRIGGER_OFF_VALUE, disableDispatcherModule, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, TRIGGER_OFF_VALUE,
makeDispatcherModuleParameters, entityIsGrabbable, makeRunningValues, NEAR_GRAB_RADIUS, findGroupParent, Vec3, cloneEntity, makeDispatcherModuleParameters, entityIsGrabbable, makeRunningValues, NEAR_GRAB_RADIUS, findGrabbableGroupParent, Vec3,
entityIsCloneable, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE, distanceBetweenPointAndEntityBoundingBox, cloneEntity, entityIsCloneable, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE,
getGrabbableData, getEnabledModuleByName, DISPATCHER_PROPERTIES, HMD, NEAR_GRAB_DISTANCE distanceBetweenPointAndEntityBoundingBox, getGrabbableData, getEnabledModuleByName, DISPATCHER_PROPERTIES, HMD,
NEAR_GRAB_DISTANCE
*/ */
Script.include("/~/system/libraries/controllerDispatcherUtils.js"); Script.include("/~/system/libraries/controllerDispatcherUtils.js");
@ -80,9 +81,6 @@ Script.include("/~/system/libraries/controllers.js");
this.endNearGrabEntity = function () { this.endNearGrabEntity = function () {
this.endGrab(); this.endGrab();
this.grabbing = false;
this.targetEntityID = null;
var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args); Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args);
Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({ Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
@ -90,6 +88,9 @@ Script.include("/~/system/libraries/controllers.js");
grabbedEntity: this.targetEntityID, grabbedEntity: this.targetEntityID,
joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand" joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
})); }));
this.grabbing = false;
this.targetEntityID = null;
}; };
this.getTargetProps = function (controllerData) { this.getTargetProps = function (controllerData) {
@ -110,7 +111,7 @@ Script.include("/~/system/libraries/controllers.js");
if (entityIsGrabbable(props) || entityIsCloneable(props)) { if (entityIsGrabbable(props) || entityIsCloneable(props)) {
if (!entityIsCloneable(props)) { if (!entityIsCloneable(props)) {
// if we've attempted to grab a non-cloneable child, roll up to the root of the tree // if we've attempted to grab a non-cloneable child, roll up to the root of the tree
var groupRootProps = findGroupParent(controllerData, props); var groupRootProps = findGrabbableGroupParent(controllerData, props);
if (entityIsGrabbable(groupRootProps)) { if (entityIsGrabbable(groupRootProps)) {
return groupRootProps; return groupRootProps;
} }

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

@ -46,7 +46,7 @@
makeLaserLockInfo:true, makeLaserLockInfo:true,
entityHasActions:true, entityHasActions:true,
ensureDynamic:true, ensureDynamic:true,
findGroupParent:true, findGrabbableGroupParent:true,
BUMPER_ON_VALUE:true, BUMPER_ON_VALUE:true,
getEntityParents:true, getEntityParents:true,
findHandChildEntities:true, findHandChildEntities:true,
@ -439,7 +439,7 @@ ensureDynamic = function (entityID) {
} }
}; };
findGroupParent = function (controllerData, targetProps) { findGrabbableGroupParent = function (controllerData, targetProps) {
while (targetProps.grab.grabDelegateToParent && while (targetProps.grab.grabDelegateToParent &&
targetProps.parentID && targetProps.parentID &&
targetProps.parentID !== Uuid.NULL && targetProps.parentID !== Uuid.NULL &&
@ -448,6 +448,9 @@ findGroupParent = function (controllerData, targetProps) {
if (!parentProps) { if (!parentProps) {
break; break;
} }
if (!entityIsGrabbable(parentProps)) {
break;
}
parentProps.id = targetProps.parentID; parentProps.id = targetProps.parentID;
targetProps = parentProps; targetProps = parentProps;
controllerData.nearbyEntityPropertiesByID[targetProps.id] = targetProps; controllerData.nearbyEntityPropertiesByID[targetProps.id] = targetProps;
@ -614,7 +617,7 @@ if (typeof module !== 'undefined') {
unhighlightTargetEntity: unhighlightTargetEntity, unhighlightTargetEntity: unhighlightTargetEntity,
clearHighlightedEntities: clearHighlightedEntities, clearHighlightedEntities: clearHighlightedEntities,
makeRunningValues: makeRunningValues, makeRunningValues: makeRunningValues,
findGroupParent: findGroupParent, findGrabbableGroupParent: findGrabbableGroupParent,
LEFT_HAND: LEFT_HAND, LEFT_HAND: LEFT_HAND,
RIGHT_HAND: RIGHT_HAND, RIGHT_HAND: RIGHT_HAND,
BUMPER_ON_VALUE: BUMPER_ON_VALUE, BUMPER_ON_VALUE: BUMPER_ON_VALUE,