external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'core/master' into DraftEnhancement

Browse Source
This commit is contained in:
Anthony Calosa
2022-02-11 14:50:06 +08:00
parent 1eb4aa5647 308cea227f
commit 370f9eed16
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -21,7 +21,7 @@ public class SplashScreen extends FContainer {
private TextureRegion background; private TextureRegion background;
private final FProgressBar progressBar; private final FProgressBar progressBar;
private FSkinFont disclaimerFont; private FSkinFont disclaimerFont;
private boolean preparedForDialogs, showModeSelector, init, nobg; private boolean preparedForDialogs, showModeSelector, init, animateLogo;
private FButton btnAdventure, btnHome; private FButton btnAdventure, btnHome;
private BGAnimation bgAnimation; private BGAnimation bgAnimation;
@@ -87,7 +87,8 @@ public class SplashScreen extends FContainer {
} else if (percentage > 1) { } else if (percentage > 1) {
percentage = 1; percentage = 1;
} }
if (nobg) { if (animateLogo) {
g.drawImage(FSkinTexture.BG_TEXTURE, 0, 0, getWidth(), getHeight());
float xmod = Forge.getScreenHeight() > 1000 ? 1.5f : Forge.getScreenHeight() > 800 ? 1.3f : 1f; float xmod = Forge.getScreenHeight() > 1000 ? 1.5f : Forge.getScreenHeight() > 800 ? 1.3f : 1f;
float scale = xmod > 1f ? xmod+(percentage*0.7f) : 0.7f+(percentage*0.7f); float scale = xmod > 1f ? xmod+(percentage*0.7f) : 0.7f+(percentage*0.7f);
float hscale = xmod > 1f ? xmod+0.2f+(percentage*0.9f) : 0.9f+(percentage*0.9f); float hscale = xmod > 1f ? xmod+0.2f+(percentage*0.9f) : 0.9f+(percentage*0.9f);
@@ -114,7 +115,7 @@ public class SplashScreen extends FContainer {
@Override @Override
protected void onEnd(boolean endingAll) { protected void onEnd(boolean endingAll) {
if (nobg) { if (animateLogo) {
if (openAdventure) if (openAdventure)
Forge.openAdventure(); Forge.openAdventure();
else else
@@ -168,7 +169,7 @@ public class SplashScreen extends FContainer {
else { else {
btnAdventure.setVisible(false); btnAdventure.setVisible(false);
btnHome.setVisible(false); btnHome.setVisible(false);
nobg = true; animateLogo = true;
bgAnimation.progress = 0; bgAnimation.progress = 0;
bgAnimation.openAdventure = true; bgAnimation.openAdventure = true;
} }
@@ -182,7 +183,7 @@ public class SplashScreen extends FContainer {
else { else {
btnAdventure.setVisible(false); btnAdventure.setVisible(false);
btnHome.setVisible(false); btnHome.setVisible(false);
nobg = true; animateLogo = true;
bgAnimation.progress = 0; bgAnimation.progress = 0;
bgAnimation.openAdventure = false; bgAnimation.openAdventure = false;
} }