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

add velocity argument to release

Browse source
This commit is contained in:
Seth Alves 2016-03-15 09:00:01 -07:00
parent 8b5b6f5a20
commit 9df8c4e969
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
examples/controllers/handControllerGrab.js
View file

@ -345,7 +345,7 @@ function MyController(hand) {
this.continueFarTrigger();
break;
case STATE_RELEASE:
this.release();
this.release(false);
break;
}
};
@ -1382,7 +1382,7 @@ function MyController(hand) {
if (this.entityActivated) {
var saveGrabbedID = this.grabbedEntity;
this.release();
this.release(true);
this.grabbedEntity = saveGrabbedID;
}
@ -1429,11 +1429,6 @@ function MyController(hand) {
}
} else {
// grab entity via parenting
// if (this.actionID) {
// var saveGrabbedID = this.grabbedEntity;
// this.release();
// this.grabbedEntity = saveGrabbedID;
// }
this.actionID = null;
var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
reparentProps = {
@ -1708,12 +1703,10 @@ function MyController(hand) {
Entities.callEntityMethod(entityID, "stopTouch", args);
};
this.release = function() {
this.release = function(noVelocity) {
this.turnLightsOff();
this.turnOffVisualizations();
var noVelocity = false;
if (this.grabbedEntity !== null) {
if (this.actionID !== null) {
Entities.deleteAction(this.grabbedEntity, this.actionID);
@ -1744,7 +1737,7 @@ function MyController(hand) {
};
this.cleanup = function() {
this.release();
this.release(false);
Entities.deleteEntity(this.particleBeamObject);
Entities.deleteEntity(this.spotLight);
Entities.deleteEntity(this.pointLight);