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

Immediately hide fading overlays if other hand starts teleporting

Browse source
This commit is contained in:
David Rowe 2018-09-27 15:20:43 +12:00
parent 6ae206677d
commit 3284b2a90e
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/system/controllers/controllerModules/teleport.js
View file

@ -580,6 +580,21 @@ Script.include("/~/system/libraries/controllers.js");
} }
}; };
this.cancelFade = function () {
// Other hand may call this to immediately hide fading overlays.
var i, length;
if (this.teleportedFadeTimer) {
Overlays.editOverlay(this.teleportedTargetOverlay, { visible: false });
if (this.wasPlayAreaVisible) {
Overlays.editOverlay(this.playAreaOverlay, { visible: false });
for (i = 0, length = this.playAreaSensorPositionOverlays.length; i < length; i++) {
Overlays.editOverlay(this.playAreaSensorPositionOverlays[i], { visible: false });
}
}
this.teleportedFadeTimer = null;
}
};
this.setTeleportVisible = function (visible, mode, fade) { this.setTeleportVisible = function (visible, mode, fade) {
// Scales in teleport target and play area when start displaying them. // Scales in teleport target and play area when start displaying them.
if (visible === this.isTeleportVisible) { if (visible === this.isTeleportVisible) {
@ -596,6 +611,7 @@ Script.include("/~/system/libraries/controllers.js");
end: { dimensions: Vec3.ZERO } end: { dimensions: Vec3.ZERO }
} }
); );
this.getOtherModule().cancelFade();
this.teleportScaleStart = Date.now(); this.teleportScaleStart = Date.now();
this.teleportScaleFactor = 0; this.teleportScaleFactor = 0;
this.scaleInTeleport(); this.scaleInTeleport();