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

reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab

Browse source
This commit is contained in:
Seth Alves 2015-11-17 14:58:20 -08:00
parent d21a2fee20
commit c6051bb325
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
examples/controllers/handControllerGrab.js
View file

@ -47,7 +47,7 @@ var PICK_MAX_DISTANCE = 500; // max length of pick-ray
// near grabbing // near grabbing
// //
var GRAB_RADIUS = 0.3; // if the ray misses but an object is this close, it will still be selected var GRAB_RADIUS = 0.01; // if the ray misses but an object is this close, it will still be selected
var NEAR_GRABBING_ACTION_TIMEFRAME = 0.05; // how quickly objects move to their new position var NEAR_GRABBING_ACTION_TIMEFRAME = 0.05; // how quickly objects move to their new position
var NEAR_GRABBING_VELOCITY_SMOOTH_RATIO = 1.0; // adjust time-averaging of held object's velocity. 1.0 to disable. var NEAR_GRABBING_VELOCITY_SMOOTH_RATIO = 1.0; // adjust time-averaging of held object's velocity. 1.0 to disable.
var NEAR_PICK_MAX_DISTANCE = 0.3; // max length of pick-ray for close grabbing to be selected var NEAR_PICK_MAX_DISTANCE = 0.3; // max length of pick-ray for close grabbing to be selected
@ -382,8 +382,6 @@ function MyController(hand) {
length: PICK_MAX_DISTANCE length: PICK_MAX_DISTANCE
}; };
this.lineOn(distantPickRay.origin, Vec3.multiply(distantPickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
// don't pick 60x per second. // don't pick 60x per second.
var pickRays = []; var pickRays = [];
var now = Date.now(); var now = Date.now();
@ -538,16 +536,17 @@ function MyController(hand) {
grabbableData = grabbableDataForCandidate; grabbableData = grabbableDataForCandidate;
} }
} }
if (this.grabbedEntity === null) { if (this.grabbedEntity !== null) {
return; if (grabbableData.wantsTrigger) {
} this.setState(STATE_NEAR_TRIGGER);
if (grabbableData.wantsTrigger) { return;
this.setState(STATE_NEAR_TRIGGER); } else if (!props.locked && props.collisionsWillMove) {
return; this.setState(this.state == STATE_SEARCHING ? STATE_NEAR_GRABBING : STATE_EQUIP)
} else if (!props.locked && props.collisionsWillMove) { return;
this.setState(this.state == STATE_SEARCHING ? STATE_NEAR_GRABBING : STATE_EQUIP) }
return;
} }
this.lineOn(distantPickRay.origin, Vec3.multiply(distantPickRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR);
}; };
this.distanceHolding = function() { this.distanceHolding = function() {