Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 05:26:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6297 from birarda/grab-locked

Browse source 
allow non-colliding grab of locked entities
This commit is contained in:
Seth Alves 2015-11-03 14:31:19 -08:00
commit e5da29e08a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/controllers/handControllerGrab.js
View file

@ -291,7 +291,7 @@ function MyController(hand) {
return this.triggerValue < TRIGGER_OFF_VALUE; return this.triggerValue < TRIGGER_OFF_VALUE;
}; };
this.triggerSqueezed = function() { this.triggerSqueezed = function() {
var triggerValue = this.rawTriggerValue; var triggerValue = this.rawTriggerValue;
return triggerValue > TRIGGER_ON_VALUE; return triggerValue > TRIGGER_ON_VALUE;
}; };
@ -352,7 +352,7 @@ function MyController(hand) {
var intersection = Entities.findRayIntersection(pickRayBacked, true); var intersection = Entities.findRayIntersection(pickRayBacked, true);
if (intersection.intersects && !intersection.properties.locked) { if (intersection.intersects) {
// the ray is intersecting something we can move. // the ray is intersecting something we can move.
var intersectionDistance = Vec3.distance(pickRay.origin, intersection.intersection); var intersectionDistance = Vec3.distance(pickRay.origin, intersection.intersection);
this.grabbedEntity = intersection.entityID; this.grabbedEntity = intersection.entityID;
@ -381,7 +381,7 @@ function MyController(hand) {
// the hand is very close to the intersected object. go into close-grabbing mode. // the hand is very close to the intersected object. go into close-grabbing mode.
if (grabbableData.wantsTrigger) { if (grabbableData.wantsTrigger) {
this.setState(STATE_NEAR_GRABBING_NON_COLLIDING); this.setState(STATE_NEAR_GRABBING_NON_COLLIDING);
} else { } else if (!intersection.properties.locked) {
this.setState(STATE_NEAR_GRABBING); this.setState(STATE_NEAR_GRABBING);
} }
} else { } else {
@ -390,7 +390,8 @@ function MyController(hand) {
this.grabbedEntity = null; this.grabbedEntity = null;
} else { } else {
// the hand is far from the intersected object. go into distance-holding mode // the hand is far from the intersected object. go into distance-holding mode
if (intersection.properties.collisionsWillMove) { if (intersection.properties.collisionsWillMove
&& !intersection.properties.locked) {
this.setState(STATE_DISTANCE_HOLDING); this.setState(STATE_DISTANCE_HOLDING);
} else { } else {
this.setState(STATE_FAR_GRABBING_NON_COLLIDING); this.setState(STATE_FAR_GRABBING_NON_COLLIDING);
@ -502,7 +503,7 @@ function MyController(hand) {
// How far did the avatar turn this timestep? // How far did the avatar turn this timestep?
// Note: The following code is too long because we need a Quat.quatBetween() function // Note: The following code is too long because we need a Quat.quatBetween() function
// that returns the minimum quaternion between two quaternions. // that returns the minimum quaternion between two quaternions.
var currentOrientation = MyAvatar.orientation; var currentOrientation = MyAvatar.orientation;
if (Quat.dot(currentOrientation, this.currentAvatarOrientation) < 0.0) { if (Quat.dot(currentOrientation, this.currentAvatarOrientation) < 0.0) {
var negativeCurrentOrientation = { var negativeCurrentOrientation = {