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

adding fade in and fade outt in interstitial for progress

Browse source
This commit is contained in:
Wayne Chen 2018-10-18 13:12:04 -07:00
parent fd3c0d2f76
commit 6cf9608c97
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/system/interstitialPage.js
View file

@ -381,8 +381,8 @@
function updateOverlays(physicsEnabled) { function updateOverlays(physicsEnabled) {
if (isInterstitialOverlaysVisible !== !physicsEnabled) { if (isInterstitialOverlaysVisible !== !physicsEnabled && !physicsEnabled === true) {
// visible changed // visible changed to true.
isInterstitialOverlaysVisible = !physicsEnabled; isInterstitialOverlaysVisible = !physicsEnabled;
} }
@ -432,6 +432,11 @@
if (physicsEnabled) { if (physicsEnabled) {
Camera.mode = previousCameraMode; Camera.mode = previousCameraMode;
} }
if (isInterstitialOverlaysVisible !== !physicsEnabled && !physicsEnabled === false) {
// visible changed to false.
isInterstitialOverlaysVisible = !physicsEnabled;
}
} }
function scaleInterstitialPage(sensorToWorldScale) { function scaleInterstitialPage(sensorToWorldScale) {

13
scripts/system/progress.js
View file

@ -267,7 +267,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) && !isInInterstitialMode && !isInterstitialOverlaysVisible) { // 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,10 +307,13 @@
} 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, {
visible: !isHMD, visible: !isHMD && visible,
bounds: { bounds: {
x: barDesktop.repeat - x, x: barDesktop.repeat - x,
y: windowHeight - barDesktop.height, y: windowHeight - barDesktop.height,
@ -320,7 +323,7 @@
}); });
Overlays.editOverlay(barHMD.overlay, { Overlays.editOverlay(barHMD.overlay, {
visible: isHMD, visible: isHMD && visible,
bounds: { bounds: {
x: BAR_HMD_REPEAT - x, x: BAR_HMD_REPEAT - x,
y: windowHeight - BAR_HMD_HEIGHT, y: windowHeight - BAR_HMD_HEIGHT,
@ -330,11 +333,11 @@
}); });
Overlays.editOverlay(textDesktop.overlay, { Overlays.editOverlay(textDesktop.overlay, {
visible: !isHMD visible: !isHMD && visible
}); });
Overlays.editOverlay(textHMD.overlay, { Overlays.editOverlay(textHMD.overlay, {
visible: isHMD visible: isHMD && visible
}); });
// Update 2D overlays to maintain positions at bottom middle of window // Update 2D overlays to maintain positions at bottom middle of window