Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12308 from vladest/fix_progress_animation

Browse source 
Image overlay uses bounds property
This commit is contained in:
Seth Alves 2018-02-02 12:53:20 -08:00 committed by GitHub
commit 00b184124d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/progress.js
View file

@ -300,7 +300,7 @@
if (visible) { if (visible) {
x = ((Date.now() / 1000) % ANIMATION_SECONDS_PER_REPEAT) / ANIMATION_SECONDS_PER_REPEAT; x = ((Date.now() / 1000) % ANIMATION_SECONDS_PER_REPEAT) / ANIMATION_SECONDS_PER_REPEAT;
if (isHMD) { if (!isHMD) {
x = x * barDesktop.repeat; x = x * barDesktop.repeat;
} else { } else {
x = x * BAR_HMD_REPEAT; x = x * BAR_HMD_REPEAT;
@ -309,9 +309,9 @@
// Update progress bar // Update progress bar
Overlays.editOverlay(barDesktop.overlay, { Overlays.editOverlay(barDesktop.overlay, {
visible: !isHMD, visible: !isHMD,
subImage: { bounds: {
x: barDesktop.repeat - x, x: barDesktop.repeat - x,
y: 0, y: windowHeight - barDesktop.height,
width: barDesktop.width - barDesktop.repeat, width: barDesktop.width - barDesktop.repeat,
height: barDesktop.height height: barDesktop.height
} }
@ -319,9 +319,9 @@
Overlays.editOverlay(barHMD.overlay, { Overlays.editOverlay(barHMD.overlay, {
visible: isHMD, visible: isHMD,
subImage: { bounds: {
x: BAR_HMD_REPEAT - x, x: BAR_HMD_REPEAT - x,
y: 0, y: windowHeight - BAR_HMD_HEIGHT,
width: BAR_HMD_WIDTH - BAR_HMD_REPEAT, width: BAR_HMD_WIDTH - BAR_HMD_REPEAT,
height: BAR_HMD_HEIGHT height: BAR_HMD_HEIGHT
} }