Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:06:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix updateSeeking

Browse source
This commit is contained in:
howard-stearns 2016-05-03 14:36:52 -07:00
parent adb11c9266
commit eb0517f3cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/controllers/handControllerPointer.js
View file

@ -155,7 +155,7 @@ var isSeeking = false;
var averageMouseVelocity = 0, lastIntegration = 0, lastMouse; var averageMouseVelocity = 0, lastIntegration = 0, lastMouse;
var WEIGHTING = 1 / 20; // simple moving average over last 20 samples var WEIGHTING = 1 / 20; // simple moving average over last 20 samples
var ONE_MINUS_WEIGHTING = 1 - WEIGHTING; var ONE_MINUS_WEIGHTING = 1 - WEIGHTING;
var AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO = 2.5; var AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO = 5;
function isShakingMouse() { // True if the person is waving the mouse around trying to find it. function isShakingMouse() { // True if the person is waving the mouse around trying to find it.
var now = Date.now(), mouse = Reticle.position, isShaking = false; var now = Date.now(), mouse = Reticle.position, isShaking = false;
if (lastIntegration && (lastIntegration !== now)) { if (lastIntegration && (lastIntegration !== now)) {
@ -176,7 +176,7 @@ function updateSeeking() {
if (!isSeeking) { return; } if (!isSeeking) { return; }
averageMouseVelocity = lastIntegration = 0; averageMouseVelocity = lastIntegration = 0;
var lookAt2D = HMD.getHUDLookAtPosition2D(); var lookAt2D = HMD.getHUDLookAtPosition2D();
if (!lookAt2D) { return; } // E.g., if parallel to location in HUD if (!lookAt2D) { print('Cannot seek without lookAt position'); return; } // E.g., if parallel to location in HUD
var copy = Reticle.position; var copy = Reticle.position;
function updateDimension(axis) { function updateDimension(axis) {
var distanceBetween = lookAt2D[axis] - Reticle.position[axis]; var distanceBetween = lookAt2D[axis] - Reticle.position[axis];
@ -188,7 +188,7 @@ function updateSeeking() {
if (!updateDimension('x') && !updateDimension('y')) { if (!updateDimension('x') && !updateDimension('y')) {
isSeeking = false; isSeeking = false;
} else { } else {
Reticle.position(copy); Reticle.setPosition(copy); // Not setReticlePosition
} }
} }