Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 23:35:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added haptics and hysteresis to drop gesture

Browse source
This commit is contained in:
Anthony J. Thibault 2016-07-14 10:53:47 -07:00
parent 51cce939b3
commit e62d34136d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/system/controllers/handControllerGrab.js
View file

@ -1732,8 +1732,7 @@ function MyController(hand) {
}; };
this.dropGestureReset = function () { this.dropGestureReset = function () {
this.fastHandMoveDetected = false; this.prevHandIsUpsideDown = false;
this.fastHandMoveTimer = 0;
}; };
this.dropGestureProcess = function (deltaTime) { this.dropGestureProcess = function (deltaTime) {
@ -1744,18 +1743,21 @@ function MyController(hand) {
var localHandUpAxis = this.hand === RIGHT_HAND ? {x: 1, y: 0, z: 0} : {x: -1, y: 0, z: 0}; var localHandUpAxis = this.hand === RIGHT_HAND ? {x: 1, y: 0, z: 0} : {x: -1, y: 0, z: 0};
var worldHandUpAxis = Vec3.multiplyQbyV(worldHandRotation, localHandUpAxis); var worldHandUpAxis = Vec3.multiplyQbyV(worldHandRotation, localHandUpAxis);
var DOWN = {x: 0, y: -1, z: 0}; var DOWN = {x: 0, y: -1, z: 0};
var ROTATION_THRESHOLD = Math.cos(Math.PI / 8);
var DROP_ANGLE = Math.PI / 7;
var HYSTERESIS_FACTOR = 1.1;
var ROTATION_ENTER_THRESHOLD = Math.cos(DROP_ANGLE);
var ROTATION_EXIT_THRESHOLD = Math.cos(DROP_ANGLE * HYSTERESIS_FACTOR);
var rotationThreshold = this.prevHandIsUpsideDown ? ROTATION_EXIT_THRESHOLD : ROTATION_ENTER_THRESHOLD;
var handIsUpsideDown = false; var handIsUpsideDown = false;
if (Vec3.dot(worldHandUpAxis, DOWN) > ROTATION_THRESHOLD) { if (Vec3.dot(worldHandUpAxis, DOWN) > rotationThreshold) {
handIsUpsideDown = true; handIsUpsideDown = true;
} }
var WANT_DEBUG = false; if (handIsUpsideDown != this.prevHandIsUpsideDown) {
if (WANT_DEBUG) { this.prevHandIsUpsideDown = handIsUpsideDown;
print("zAxis = " + worldHandUpAxis.x + ", " + worldHandUpAxis.y + ", " + worldHandUpAxis.z); Controller.triggerShortHapticPulse(0.5, this.hand);
print("dot = " + Vec3.dot(worldHandUpAxis, DOWN) + ", ROTATION_THRESHOLD = " + ROTATION_THRESHOLD);
print("handMove = " + this.fastHandMoveDetected + ", handIsUpsideDown = " + handIsUpsideDown);
} }
return handIsUpsideDown; return handIsUpsideDown;