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

Merge pull request #9361 from howard-stearns/fix-laser-vs-mouse-again

Browse source 
Fix laser vs mouse again
This commit is contained in:
Howard Stearns 2017-01-11 19:38:54 -08:00 committed by GitHub
commit 48304a3cc2
1 changed files with 11 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,9 +20,10 @@
// When partially squeezing over a HUD element, a laser or the reticle is shown where the active hand // When partially squeezing over a HUD element, a laser or the reticle is shown where the active hand
// controller beam intersects the HUD. // controller beam intersects the HUD.
var systemLaserOn = false; var activeTrigger;
function isLaserOn() {
return activeTrigger.partial();
}
Script.include("../libraries/controllers.js"); Script.include("../libraries/controllers.js");
// UTILITIES ------------- // UTILITIES -------------
@ -124,12 +125,6 @@ function ignoreMouseActivity() {
if (!Reticle.allowMouseCapture) { if (!Reticle.allowMouseCapture) {
return true; return true;
} }
// if the lasers are on, then reticle/mouse should be hidden and we can ignore it for seeking or depth updating
if (systemLaserOn) {
return true;
}
var pos = Reticle.position; var pos = Reticle.position;
if (!pos || (pos.x == -1 && pos.y == -1)) { if (!pos || (pos.x == -1 && pos.y == -1)) {
return true; return true;
@ -270,12 +265,6 @@ var ONE_MINUS_WEIGHTING = 1 - WEIGHTING;
var AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO = 20; var AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO = 20;
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 the lasers are on, then we ignore mouse shaking
if (systemLaserOn) {
return false;
}
if (lastIntegration && (lastIntegration !== now)) { if (lastIntegration && (lastIntegration !== now)) {
var velocity = Vec3.length(Vec3.subtract(mouse, lastMouse)) / (now - lastIntegration); var velocity = Vec3.length(Vec3.subtract(mouse, lastMouse)) / (now - lastIntegration);
averageMouseVelocity = (ONE_MINUS_WEIGHTING * averageMouseVelocity) + (WEIGHTING * velocity); averageMouseVelocity = (ONE_MINUS_WEIGHTING * averageMouseVelocity) + (WEIGHTING * velocity);
@ -290,16 +279,8 @@ function isShakingMouse() { // True if the person is waving the mouse around try
var NON_LINEAR_DIVISOR = 2; var NON_LINEAR_DIVISOR = 2;
var MINIMUM_SEEK_DISTANCE = 0.1; var MINIMUM_SEEK_DISTANCE = 0.1;
function updateSeeking(doNotStartSeeking) { function updateSeeking(doNotStartSeeking) {
// if the lasers are on, then we never do seeking if (!doNotStartSeeking && !isLaserOn() && (!Reticle.visible || isShakingMouse())) {
if (systemLaserOn) { isSeeking = true;
isSeeking = false;
return;
}
if (!doNotStartSeeking && (!Reticle.visible || isShakingMouse())) {
if (!isSeeking) {
isSeeking = true;
}
} // e.g., if we're about to turn it on with first movement. } // e.g., if we're about to turn it on with first movement.
if (!isSeeking) { if (!isSeeking) {
return; return;
@ -340,7 +321,7 @@ function updateMouseActivity(isClick) {
return; return;
} // Bug: mouse clicks should keep going. Just not hand controller clicks } // Bug: mouse clicks should keep going. Just not hand controller clicks
handControllerLockOut.update(now); handControllerLockOut.update(now);
Reticle.visible = !systemLaserOn; Reticle.visible = true;
} }
function expireMouseCursor(now) { function expireMouseCursor(now) {
if (!isPointingAtOverlay() && mouseCursorActivity.expired(now)) { if (!isPointingAtOverlay() && mouseCursorActivity.expired(now)) {
@ -392,7 +373,7 @@ setupHandler(Controller.mouseDoublePressEvent, onMouseClick);
var leftTrigger = new Trigger('left'); var leftTrigger = new Trigger('left');
var rightTrigger = new Trigger('right'); var rightTrigger = new Trigger('right');
var activeTrigger = rightTrigger; activeTrigger = rightTrigger;
var activeHand = Controller.Standard.RightHand; var activeHand = Controller.Standard.RightHand;
var LEFT_HUD_LASER = 1; var LEFT_HUD_LASER = 1;
var RIGHT_HUD_LASER = 2; var RIGHT_HUD_LASER = 2;
@ -492,6 +473,7 @@ var LASER_ALPHA = 0.5;
var LASER_SEARCH_COLOR_XYZW = {x: 10 / 255, y: 10 / 255, z: 255 / 255, w: LASER_ALPHA}; var LASER_SEARCH_COLOR_XYZW = {x: 10 / 255, y: 10 / 255, z: 255 / 255, w: LASER_ALPHA};
var LASER_TRIGGER_COLOR_XYZW = {x: 250 / 255, y: 10 / 255, z: 10 / 255, w: LASER_ALPHA}; var LASER_TRIGGER_COLOR_XYZW = {x: 250 / 255, y: 10 / 255, z: 10 / 255, w: LASER_ALPHA};
var SYSTEM_LASER_DIRECTION = {x: 0, y: 0, z: -1}; var SYSTEM_LASER_DIRECTION = {x: 0, y: 0, z: -1};
var systemLaserOn = false;
function clearSystemLaser() { function clearSystemLaser() {
if (!systemLaserOn) { if (!systemLaserOn) {
return; return;
@ -500,7 +482,6 @@ function clearSystemLaser() {
HMD.disableExtraLaser(); HMD.disableExtraLaser();
systemLaserOn = false; systemLaserOn = false;
weMovedReticle = true; weMovedReticle = true;
Reticle.position = { x: -1, y: -1 };
} }
function setColoredLaser() { // answer trigger state if lasers supported, else falsey. function setColoredLaser() { // answer trigger state if lasers supported, else falsey.
var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW; var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW;
@ -584,12 +565,6 @@ function update() {
Reticle.visible = false; Reticle.visible = false;
} }
var BASIC_TIMER_INTERVAL = 20; // 20ms = 50hz good enough
var updateIntervalTimer = Script.setInterval(function(){
update();
}, BASIC_TIMER_INTERVAL);
// Check periodically for changes to setup. // Check periodically for changes to setup.
var SETTINGS_CHANGE_RECHECK_INTERVAL = 10 * 1000; // 10 seconds var SETTINGS_CHANGE_RECHECK_INTERVAL = 10 * 1000; // 10 seconds
function checkSettings() { function checkSettings() {
@ -599,9 +574,10 @@ function checkSettings() {
checkSettings(); checkSettings();
var settingsChecker = Script.setInterval(checkSettings, SETTINGS_CHANGE_RECHECK_INTERVAL); var settingsChecker = Script.setInterval(checkSettings, SETTINGS_CHANGE_RECHECK_INTERVAL);
Script.update.connect(update);
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
Script.clearInterval(settingsChecker); Script.clearInterval(settingsChecker);
Script.clearInterval(updateIntervalTimer); Script.update.disconnect(update);
OffscreenFlags.navigationFocusDisabled = false; OffscreenFlags.navigationFocusDisabled = false;
}); });