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

Merge pull request #15763 from zfox23/SUI/disableInterstitialReferences

Browse source 
BUGZ-676: Remove references to interstitial from SUI version of progress.js
This commit is contained in:
Zach Fox 2019-06-13 13:52:05 -07:00 committed by GitHub
commit 6485809c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/simplifiedUI/system/progress.js
View file

@ -83,9 +83,7 @@
// The initial delay cooldown keeps us from tracking progress before the allotted time // The initial delay cooldown keeps us from tracking progress before the allotted time
// has passed. // has passed.
INITIAL_DELAY_COOLDOWN_TIME = 1000, INITIAL_DELAY_COOLDOWN_TIME = 1000,
initialDelayCooldown = 0, initialDelayCooldown = 0;
isInInterstitialMode = false;
function fade() { function fade() {
@ -267,7 +265,7 @@
// Update state // Update state
if (!visible) { // Not visible because no recent downloads if (!visible) { // Not visible because no recent downloads
if ((displayProgress < 100 || gpuTextures > 0) && !isInInterstitialMode && !isInterstitialOverlaysVisible) { // Have started downloading so fade in if (displayProgress < 100 || gpuTextures > 0) { // Have started downloading so fade in
visible = true; visible = true;
alphaDelta = ALPHA_DELTA_IN; alphaDelta = ALPHA_DELTA_IN;
fadeTimer = Script.setInterval(fade, FADE_INTERVAL); fadeTimer = Script.setInterval(fade, FADE_INTERVAL);
@ -307,9 +305,6 @@
} else { } else {
x = x * BAR_HMD_REPEAT; x = x * BAR_HMD_REPEAT;
} }
if (isInInterstitialMode || isInterstitialOverlaysVisible) {
visible = false;
}
// Update progress bar // Update progress bar
Overlays.editOverlay(barDesktop.overlay, { Overlays.editOverlay(barDesktop.overlay, {
@ -349,10 +344,6 @@
} }
} }
function interstitialModeChanged(inMode) {
isInInterstitialMode = inMode;
}
function setUp() { function setUp() {
var is4k = Window.innerWidth > 3000; var is4k = Window.innerWidth > 3000;
@ -378,7 +369,6 @@
} }
setUp(); setUp();
Window.interstitialModeChanged.connect(interstitialModeChanged);
GlobalServices.downloadInfoChanged.connect(onDownloadInfoChanged); GlobalServices.downloadInfoChanged.connect(onDownloadInfoChanged);
GlobalServices.updateDownloadInfo(); GlobalServices.updateDownloadInfo();
Script.setInterval(update, 1000 / 60); Script.setInterval(update, 1000 / 60);