Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 13:33:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

improving interstitial loading bar

Browse source
This commit is contained in:
Dante Ruiz 2018-10-31 10:13:32 -07:00
parent 2dc761a57a
commit 0279eef3a4
1 changed files with 43 additions and 40 deletions

83
scripts/system/interstitialPage.js
View file

@ -17,7 +17,8 @@
Script.include("/~/system/libraries/globals.js");
var DEBUG = false;
var MIN_LOADING_PROGRESS = 3.6;
var TOTAL_LOADING_PROGRESS = 3.8;
var TOTAL_LOADING_PROGRESS = 3.7;
var FINAL_Y_DIMENSIONS = 2.8;
var EPSILON = 0.05;
var TEXTURE_EPSILON = 0.01;
var isVisible = false;
@ -27,6 +28,7 @@
var MAX_LEFT_MARGIN = 1.9;
var INNER_CIRCLE_WIDTH = 4.7;
var DEFAULT_Z_OFFSET = 5.45;
var LOADING_IMAGE_WIDTH_PIXELS = 1024;
var previousCameraMode = Camera.mode;
var renderViewTask = Render.getConfig("RenderMainView");
@ -182,12 +184,13 @@
parentID: anchorOverlay
});
var loadingBarPlacard = Overlays.addOverlay("image3d", {
name: "Loading-Bar-Placard",
localPosition: { x: 0.0, y: -0.99, z: 0.3 },
url: Script.resourcesPath() + "images/loadingBar_placard.png",
var loadingBarProgress = Overlays.addOverlay("image3d", {
name: "Loading-Bar-Progress",
localPosition: { x: 0.0, y: -0.86, z: 0.0 },
url: Script.resourcesPath() + "images/loadingBar_progress.png",
alpha: 1,
dimensions: { x: 4, y: 2.8 },
dimensions: { x: 3.8, y: 2.8 },
visible: isVisible,
emissive: true,
ignoreRayIntersection: false,
@ -197,12 +200,12 @@
parentID: anchorOverlay
});
var loadingBarProgress = Overlays.addOverlay("image3d", {
name: "Loading-Bar-Progress",
localPosition: { x: 0.0, y: -0.90, z: 0.0 },
url: Script.resourcesPath() + "images/loadingBar_progress.png",
var loadingBarPlacard = Overlays.addOverlay("image3d", {
name: "Loading-Bar-Placard",
localPosition: { x: 0.0, y: -0.99, z: 0.4 },
url: Script.resourcesPath() + "images/loadingBar_placard.png",
alpha: 1,
dimensions: { x: 3.8, y: 2.8 },
dimensions: { x: 4, y: 2.8 },
visible: isVisible,
emissive: true,
ignoreRayIntersection: false,
@ -245,15 +248,7 @@
}
function resetValues() {
var properties = {
localPosition: { x: 1.85, y: -0.935, z: 0.0 },
dimensions: {
x: 0.1,
y: 2.8
}
};
Overlays.editOverlay(loadingBarProgress, properties);
updateProgressBar(0.0);
}
function startInterstitialPage() {
@ -382,8 +377,8 @@
function updateOverlays(physicsEnabled) {
if (isInterstitialOverlaysVisible !== !physicsEnabled && !physicsEnabled === true) {
// visible changed to true.
isInterstitialOverlaysVisible = !physicsEnabled;
// visible changed to true.
isInterstitialOverlaysVisible = !physicsEnabled;
}
var properties = {
@ -400,7 +395,7 @@
};
var loadingBarProperties = {
dimensions: { x: 0.0, y: 2.8 },
dimensions: { x: 2.0, y: 2.8 },
visible: !physicsEnabled
};
@ -434,8 +429,8 @@
}
if (isInterstitialOverlaysVisible !== !physicsEnabled && !physicsEnabled === false) {
// visible changed to false.
isInterstitialOverlaysVisible = !physicsEnabled;
// visible changed to false.
isInterstitialOverlaysVisible = !physicsEnabled;
}
}
@ -459,6 +454,27 @@
}
}
function updateProgressBar(progress) {
var progressPercentage = progress / TOTAL_LOADING_PROGRESS;
var subImageWidth = progressPercentage * LOADING_IMAGE_WIDTH_PIXELS;
var properties = {
localPosition: { x: (TOTAL_LOADING_PROGRESS / 2) - (currentProgress / 2), y: -0.86, z: 0.0 },
dimensions: {
x: currentProgress,
y: FINAL_Y_DIMENSIONS * (subImageWidth / LOADING_IMAGE_WIDTH_PIXELS)
},
subImage: {
x: 0.0,
y: 0.0,
width: subImageWidth,
height: 90
}
};
Overlays.editOverlay(loadingBarProgress, properties);
}
var MAX_TEXTURE_STABILITY_COUNT = 30;
var INTERVAL_PROGRESS = 0.04;
function update() {
@ -503,15 +519,8 @@
}
currentProgress = lerp(currentProgress, target, INTERVAL_PROGRESS);
var properties = {
localPosition: { x: (1.85 - (currentProgress / 2) - (-0.029 * (currentProgress / TOTAL_LOADING_PROGRESS))), y: -0.935, z: 0.0 },
dimensions: {
x: currentProgress,
y: 2.8
}
};
Overlays.editOverlay(loadingBarProgress, properties);
updateProgressBar(currentProgress);
if (errorConnectingToDomain) {
updateOverlays(errorConnectingToDomain);
@ -542,17 +551,11 @@
}
var whiteColor = { red: 255, green: 255, blue: 255 };
var greyColor = { red: 125, green: 125, blue: 125 };
Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay);
Overlays.hoverEnterOverlay.connect(onEnterOverlay);
Overlays.hoverLeaveOverlay.connect(onLeaveOverlay);
location.hostChanged.connect(domainChanged);
location.lookupResultsFinished.connect(function() {
Script.setTimeout(function() {
connectionToDomainFailed = !location.isConnected;
}, 1200);
});
Window.redirectErrorStateChanged.connect(toggleInterstitialPage);
MyAvatar.sensorToWorldScaleChanged.connect(scaleInterstitialPage);