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

handControllerscript is now on par with master

Browse source
This commit is contained in:
ericrius1 2015-09-23 11:38:30 -07:00
parent cc69f51882
commit 9818e2549c
1 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
examples/controllers/handControllerGrab.js
View file

@ -84,9 +84,7 @@ var STATE_DISTANCE_HOLDING = 1;
var STATE_CONTINUE_DISTANCE_HOLDING = 2;
var STATE_NEAR_GRABBING = 3;
var STATE_CONTINUE_NEAR_GRABBING = 4;
var STATE_NEAR_TOUCHING = 5;
var STATE_CONTINUE_NEAR_TOUCHING = 6;
var STATE_RELEASE = 7;
var STATE_RELEASE = 5;
var GRAB_USER_DATA_KEY = "grabKey";
@ -127,12 +125,6 @@ function controller(hand, triggerAction) {
case STATE_CONTINUE_NEAR_GRABBING:
this.continueNearGrabbing();
break;
case STATE_NEAR_TOUCHING:
this.nearTouching();
break;
case STATE_CONTINUE_NEAR_TOUCHING:
this.continueNearTouching();
break;
case STATE_RELEASE:
this.release();
break;
@ -221,20 +213,19 @@ function controller(hand, triggerAction) {
var minDistance = GRAB_RADIUS;
var grabbedEntity = null;
for (var i = 0; i < nearbyEntities.length; i++) {
var props = Entities.getEntityProperties(nearbyEntities[i], ["position", "name", "collisionsWillMove", "locked"]);
var props = Entities.getEntityProperties(nearbyEntities[i]);
var distance = Vec3.distance(props.position, handPosition);
if (distance < minDistance && props.name !== "pointer") {
if (distance < minDistance && props.name !== "pointer" &&
props.collisionsWillMove === 1 &&
props.locked === 0) {
this.grabbedEntity = nearbyEntities[i];
minDistance = distance;
}
}
if (this.grabbedEntity === null) {
this.lineOn(pickRay.origin, Vec3.multiply(pickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
} else if (props.locked === 0 && props.collisionsWillMove === 1) {
} else {
this.state = STATE_NEAR_GRABBING;
} else if (props.collisionsWillMove === 0) {
// We have grabbed a non-physical object, so we want to trigger a touch event as opposed to a grab event
this.state = STATE_NEAR_TOUCHING;
}
}
}
@ -369,23 +360,6 @@ function controller(hand, triggerAction) {
this.currentObjectTime = Date.now();
}
this.nearTouching = function() {
if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE;
return;
}
Entities.callEntityMethod(this.grabbedEntity, "startNearTouch")
this.state = STATE_CONTINUE_NEAR_TOUCHING;
}
this.continueNearTouching = function() {
if (!this.triggerSmoothedSqueezed()) {
this.state = STATE_RELEASE;
return;
}
Entities.callEntityMethod(this.grabbedEntity, "continueNearTouch");
}
this.continueNearGrabbing = function() {
if (!this.triggerSmoothedSqueezed()) {