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

fix mouse vs lasers, again

Browse source
This commit is contained in:
howard-stearns 2017-01-11 14:24:24 -08:00
parent a808a8c749
commit 357b4db1db
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +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 activeTrigger;
function isLaserOn() {
return activeTrigger.partial();
}
Script.include("../libraries/controllers.js"); Script.include("../libraries/controllers.js");
// UTILITIES ------------- // UTILITIES -------------
@ -275,7 +279,7 @@ 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 (!doNotStartSeeking && (!Reticle.visible || isShakingMouse())) { if (!doNotStartSeeking && !isLaserOn() && (!Reticle.visible || isShakingMouse())) {
if (!isSeeking) { if (!isSeeking) {
print('Start seeking mouse.'); print('Start seeking mouse.');
isSeeking = true; isSeeking = true;
@ -374,7 +378,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;