Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14280 from ElderOrb/FB17381

Browse source 
FB17381 - Reticle.setVisible isn't working
This commit is contained in:
John Conklin II 2018-11-20 09:53:52 -08:00 committed by GitHub
commit 87cac67c75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/controllerModules/mouseHMD.js
View file

@ -29,6 +29,7 @@
function MouseHMD() {
var _this = this;
this.hmdWasActive = HMD.active;
this.mouseMoved = false;
this.mouseActivity = new TimeLock(5000);
this.handControllerActivity = new TimeLock(4000);
@ -102,6 +103,8 @@
this.isReady = function(controllerData, deltaTime) {
var now = Date.now();
var hmdChanged = this.hmdWasActive !== HMD.active;
this.hmdWasActive = HMD.active;
this.triggersPressed(controllerData, now);
if (HMD.active) {
if (!this.mouseActivity.expired(now) && _this.handControllerActivity.expired()) {
@ -110,7 +113,7 @@
} else {
Reticle.visible = false;
}
} else if (!Reticle.visible) {
} else if (hmdChanged && !Reticle.visible) {
Reticle.visible = true;
}