Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix grab entity methods

Browse source
This commit is contained in:
Seth Alves 2017-09-15 12:07:50 -07:00
parent b67c571aaa
commit 0816a8af27
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -238,7 +238,7 @@ Script.include("/~/system/libraries/controllers.js");
if (this.actionID !== null) { if (this.actionID !== 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, "startDistanceGrab", args); Entities.callEntityMethod(this.grabbedThingID, "startDistanceGrab", args);
} }
Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand); Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
@ -272,7 +272,7 @@ Script.include("/~/system/libraries/controllers.js");
this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, handMoved); this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, handMoved);
var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
Entities.callEntityMethod(this.targetEntityID, "continueDistanceGrab", args); Entities.callEntityMethod(this.grabbedThingID, "continueDistanceGrab", args);
// Update radialVelocity // Update radialVelocity
var lastVelocity = Vec3.multiply(worldHandDelta, 1.0 / deltaObjectTime); var lastVelocity = Vec3.multiply(worldHandDelta, 1.0 / deltaObjectTime);
@ -337,7 +337,7 @@ Script.include("/~/system/libraries/controllers.js");
Entities.deleteAction(this.grabbedThingID, this.actionID); Entities.deleteAction(this.grabbedThingID, this.actionID);
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.grabbedThingID, "releaseGrab", args);
this.actionID = null; this.actionID = null;
this.grabbedThingID = null; this.grabbedThingID = null;