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

debugging

Browse source
This commit is contained in:
Seth Alves 2016-03-15 13:50:23 -07:00
parent df0d96c276
commit 2b73b2c6d8
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
examples/controllers/handControllerGrab.js
View file

@ -345,7 +345,7 @@ function MyController(hand) {
this.continueFarTrigger(); this.continueFarTrigger();
break; break;
case STATE_RELEASE: case STATE_RELEASE:
this.release(false); this.release();
break; break;
} }
}; };
@ -1013,6 +1013,7 @@ function MyController(hand) {
var refCount = ("refCount" in grabData) ? grabData.refCount : 0; var refCount = ("refCount" in grabData) ? grabData.refCount : 0;
if (near && (refCount < 1 || entityHasActions(this.grabbedEntity))) { if (near && (refCount < 1 || entityHasActions(this.grabbedEntity))) {
if (this.state == STATE_SEARCHING) { if (this.state == STATE_SEARCHING) {
print("HERE: " + (this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"));
this.setState(STATE_NEAR_GRABBING); this.setState(STATE_NEAR_GRABBING);
} else { // (this.state == STATE_HOLD_SEARCHING) } else { // (this.state == STATE_HOLD_SEARCHING)
this.setState(STATE_HOLD); this.setState(STATE_HOLD);
@ -1381,18 +1382,20 @@ function MyController(hand) {
this.overlayLineOff(); this.overlayLineOff();
if (this.entityActivated) { if (this.entityActivated) {
print("HERE: release before grab " + (this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"));
var saveGrabbedID = this.grabbedEntity; var saveGrabbedID = this.grabbedEntity;
this.release(true); this.release();
this.grabbedEntity = saveGrabbedID; this.grabbedEntity = saveGrabbedID;
} }
var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES); var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES);
this.activateEntity(this.grabbedEntity, grabbedProperties, false); this.activateEntity(this.grabbedEntity, grabbedProperties, false);
if (grabbedProperties.dynamic && NEAR_GRABBING_KINEMATIC) { // if (grabbedProperties.dynamic && NEAR_GRABBING_KINEMATIC) {
Entities.editEntity(this.grabbedEntity, { // Entities.editEntity(this.grabbedEntity, {
dynamic: false // velocity: {x: 0, y: 0, z: 0},
}); // dynamic: false
} // });
// }
// var handRotation = this.getHandRotation(); // var handRotation = this.getHandRotation();
var handRotation = (this.hand === RIGHT_HAND) ? MyAvatar.getRightPalmRotation() : MyAvatar.getLeftPalmRotation(); var handRotation = (this.hand === RIGHT_HAND) ? MyAvatar.getRightPalmRotation() : MyAvatar.getLeftPalmRotation();
@ -1421,13 +1424,15 @@ function MyController(hand) {
} }
} }
var isPhysical = this.propsArePhysical(grabbedProperties); // || entityHasActions(this.grabbedEntity); var isPhysical = this.propsArePhysical(grabbedProperties) || entityHasActions(this.grabbedEntity);
if (isPhysical && this.state == STATE_NEAR_GRABBING) { if (isPhysical && this.state == STATE_NEAR_GRABBING) {
print("HERE: setting up hold action " + (this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"));
// grab entity via action // grab entity via action
if (!this.setupHoldAction()) { if (!this.setupHoldAction()) {
return; return;
} }
} else { } else {
print("HERE: parenting " + (this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"));
// 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 = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
@ -1446,6 +1451,12 @@ function MyController(hand) {
})); }));
} }
Entities.editEntity(this.grabbedEntity, {
velocity: {x: 0, y: 0, z: 0},
angularVelocity: {x: 0, y: 0, z: 0},
dynamic: false
});
if (this.state == STATE_NEAR_GRABBING) { if (this.state == STATE_NEAR_GRABBING) {
this.callEntityMethodOnGrabbed("startNearGrab"); this.callEntityMethodOnGrabbed("startNearGrab");
} else { // this.state == STATE_EQUIP || this.state == STATE_HOLD } else { // this.state == STATE_EQUIP || this.state == STATE_HOLD
@ -1703,10 +1714,11 @@ function MyController(hand) {
Entities.callEntityMethod(entityID, "stopTouch", args); Entities.callEntityMethod(entityID, "stopTouch", args);
}; };
this.release = function(noVelocity) { this.release = function() {
this.turnLightsOff(); this.turnLightsOff();
this.turnOffVisualizations(); this.turnOffVisualizations();
var noVelocity = false;
if (this.grabbedEntity !== null) { if (this.grabbedEntity !== null) {
if (this.actionID !== null) { if (this.actionID !== null) {
Entities.deleteAction(this.grabbedEntity, this.actionID); Entities.deleteAction(this.grabbedEntity, this.actionID);
@ -1737,7 +1749,7 @@ function MyController(hand) {
}; };
this.cleanup = function() { this.cleanup = function() {
this.release(false); this.release();
Entities.deleteEntity(this.particleBeamObject); Entities.deleteEntity(this.particleBeamObject);
Entities.deleteEntity(this.spotLight); Entities.deleteEntity(this.spotLight);
Entities.deleteEntity(this.pointLight); Entities.deleteEntity(this.pointLight);