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

don't attempt to distance-grab non-physical objects

Browse source
This commit is contained in:
Seth Alves 2016-01-29 16:37:19 -08:00
parent 9ca89172f6
commit 464f74fc1b
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/controllers/handControllerGrab.js
View file

@ -18,7 +18,7 @@ Script.include("../libraries/utils.js");
// add lines where the hand ray picking is happening // add lines where the hand ray picking is happening
// //
var WANT_DEBUG = false; var WANT_DEBUG = false;
var WANT_DEBUG_STATE = true; var WANT_DEBUG_STATE = false;
// //
// these tune time-averaging and "on" value for analog trigger // these tune time-averaging and "on" value for analog trigger
@ -122,7 +122,6 @@ var GRABBABLE_DATA_KEY = "grabbableKey"; // shared with grab.js
var GRAB_USER_DATA_KEY = "grabKey"; // shared with grab.js var GRAB_USER_DATA_KEY = "grabKey"; // shared with grab.js
var DEFAULT_GRABBABLE_DATA = { var DEFAULT_GRABBABLE_DATA = {
grabbable: true,
disableReleaseVelocity: false disableReleaseVelocity: false
}; };
@ -320,7 +319,7 @@ function MyController(hand) {
}; };
this.callEntityMethodOnGrabbed = function(entityMethodName, args) { this.callEntityMethodOnGrabbed = function(entityMethodName, args) {
print("Entity Method: " + entityMethodName + ", hand: " + this.hand); // print("Entity Method: " + entityMethodName + ", hand: " + this.hand);
if (args.length > 0) { if (args.length > 0) {
Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args); Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args);
} else { } else {
@ -663,6 +662,9 @@ function MyController(hand) {
}; };
this.propsArePhysical = function(props) { this.propsArePhysical = function(props) {
if (!props.dynamic) {
return false;
}
var isPhysical = (props.shapeType && props.shapeType != 'none'); var isPhysical = (props.shapeType && props.shapeType != 'none');
return isPhysical; return isPhysical;
} }
@ -808,7 +810,21 @@ function MyController(hand) {
var grabbableDataForCandidate = var grabbableDataForCandidate =
getEntityCustomData(GRABBABLE_DATA_KEY, candidateEntities[i], DEFAULT_GRABBABLE_DATA); getEntityCustomData(GRABBABLE_DATA_KEY, candidateEntities[i], DEFAULT_GRABBABLE_DATA);
var propsForCandidate = Entities.getEntityProperties(candidateEntities[i], GRABBABLE_PROPERTIES); var propsForCandidate = Entities.getEntityProperties(candidateEntities[i], GRABBABLE_PROPERTIES);
var grabbable = (typeof grabbableDataForCandidate.grabbable === 'undefined' || grabbableDataForCandidate.grabbable);
var isPhysical = this.propsArePhysical(propsForCandidate);
var grabbable;
if (isPhysical) {
// physical things default to grabbable
grabbable = true;
} else {
// non-physical things default to non-grabbable
grabbable = false;
}
if ("grabbable" in grabbableDataForCandidate) {
// if userData indicates that this is grabbable or not, override the default.
grabbable = grabbableDataForCandidate.grabbable;
}
if (!grabbable && !grabbableDataForCandidate.wantsTrigger) { if (!grabbable && !grabbableDataForCandidate.wantsTrigger) {
continue; continue;
} }
@ -832,6 +848,11 @@ function MyController(hand) {
continue; continue;
} }
if (this.state == STATE_SEARCHING && !isPhysical && distance > NEAR_PICK_MAX_DISTANCE) {
// we can't distance-grab non-physical
continue;
}
if (distance < minDistance) { if (distance < minDistance) {
this.grabbedEntity = candidateEntities[i]; this.grabbedEntity = candidateEntities[i];
minDistance = distance; minDistance = distance;
@ -855,7 +876,7 @@ function MyController(hand) {
return; return;
} }
// far grab or equip with action // far grab or equip with action
if (isPhysical && !near) { if ((isPhysical || this.state == STATE_EQUIP_SEARCHING) && !near) {
if (entityIsGrabbedByOther(intersection.entityID)) { if (entityIsGrabbedByOther(intersection.entityID)) {
// don't distance grab something that is already grabbed. // don't distance grab something that is already grabbed.
return; return;
@ -879,7 +900,7 @@ function MyController(hand) {
} }
// else this thing isn't physical. grab it by reparenting it. // else this thing isn't physical. grab it by reparenting it.
this.setState(STATE_NEAR_GRABBING); this.setState(this.state == STATE_SEARCHING ? STATE_NEAR_GRABBING : STATE_EQUIP);
return; return;
} }