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

Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes

Browse source
This commit is contained in:
Wayne Chen 2018-10-22 10:05:55 -07:00
commit 27813d4948
3 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
scripts/system/assets/models/black-sphere.fbx Normal file
View file

Binary file not shown.

BIN
scripts/system/assets/sounds/crystals_and_voices.mp3 Normal file
View file

Binary file not shown.

5
scripts/system/interstitialPage.js
View file

@ -21,7 +21,7 @@
var EPSILON = 0.01;
var isVisible = false;
var VOLUME = 0.4;
var tune = SoundCache.getSound("http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/crystals_and_voices.wav");
var tune = SoundCache.getSound(Script.resolvePath("/~/system/assets/sounds/crystals_and_voices.mp3"));
var sample = null;
var MAX_LEFT_MARGIN = 1.9;
var INNER_CIRCLE_WIDTH = 4.7;
@ -65,7 +65,7 @@
name: "Loading-Sphere",
position: Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0.0, y: -1.0, z: 0.0 }), Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.95, z: 0 })),
orientation: Quat.multiply(Quat.fromVec3Degrees({ x: 0, y: 180, z: 0 }), MyAvatar.orientation),
url: "http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/black-sphere.fbx",
url: Script.resolvePath("/~/system/assets/models/black-sphere.fbx"),
dimensions: DEFAULT_DIMENSIONS,
alpha: 1,
visible: isVisible,
@ -113,7 +113,6 @@
backgroundAlpha: 1,
lineHeight: 0.13,
visible: isVisible,
backgroundAlpha: 0,
ignoreRayIntersection: true,
drawInFront: true,
grabbable: false,