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

Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged

Browse source
This commit is contained in:
Wayne Chen 2018-09-06 17:58:04 -07:00
commit 45b2098346
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/system/interstitialPage.js
View file

@ -14,7 +14,7 @@
(function() { (function() {
Script.include("/~/system/libraries/Xform.js"); Script.include("/~/system/libraries/Xform.js");
var DEBUG = true; var DEBUG = false;
var MIN_LOADING_PROGRESS = 3.6; var MIN_LOADING_PROGRESS = 3.6;
var TOTAL_LOADING_PROGRESS = 3.8; var TOTAL_LOADING_PROGRESS = 3.8;
var EPSILON = 0.01; var EPSILON = 0.01;
@ -410,8 +410,21 @@
timer = Script.setTimeout(update, BASIC_TIMER_INTERVAL_MS); timer = Script.setTimeout(update, BASIC_TIMER_INTERVAL_MS);
} }
var whiteColor = {red: 255, green: 255, blue: 255};
var greyColor = {red: 125, green: 125, blue: 125};
Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay); Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay);
Overlays.hoverEnterOverlay.connect(function(overlayID, event) {
if (overlayID === loadingToTheSpotID) {
Overlays.editOverlay(loadingToTheSpotID, { color: greyColor});
}
});
Overlays.hoverLeaveOverlay.connect(function(overlayID, event) {
if (overlayID === loadingToTheSpotID) {
Overlays.editOverlay(loadingToTheSpotID, { color: whiteColor});
}
});
location.hostChanged.connect(domainChanged); location.hostChanged.connect(domainChanged);
location.lookupResultsFinished.connect(function() { location.lookupResultsFinished.connect(function() {
Script.setTimeout(function() { Script.setTimeout(function() {
@ -453,7 +466,7 @@
renderViewTask.getConfig("LightingModel")["enableAmbientLight"] = true; renderViewTask.getConfig("LightingModel")["enableAmbientLight"] = true;
renderViewTask.getConfig("LightingModel")["enableDirectionalLight"] = true; renderViewTask.getConfig("LightingModel")["enableDirectionalLight"] = true;
renderViewTask.getConfig("LightingModel")["enablePointLight"] = true; renderViewTask.getConfig("LightingModel")["enablePointLight"] = true;
Menu.setIsOptionChecked("Show Overlays", physicsEnabled); Menu.setIsOptionChecked("Show Overlays", true);
if (!HMD.active) { if (!HMD.active) {
toolbar.writeProperty("visible", true); toolbar.writeProperty("visible", true);
} }