diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java index 97243fd2..d2469e58 100644 --- a/src/itdelatrisu/opsu/states/MainMenu.java +++ b/src/itdelatrisu/opsu/states/MainMenu.java @@ -284,7 +284,10 @@ public class MainMenu extends BasicGameState { Image logoCopy = GameImage.MENU_LOGO.getImage().getScaledCopy(logo.getCurrentScale() / (float) scale * 1.05f); scaleposmodx = logoCopy.getWidth() / 2; scaleposmody = logoCopy.getHeight() / 2; + float a = Colors.GHOST_LOGO.a; + Colors.GHOST_LOGO.a *= (1d - position); logoCopy.draw(logo.getX() - scaleposmodx, logo.getY() - scaleposmody, Colors.GHOST_LOGO); + Colors.GHOST_LOGO.a = a; } else { logo.draw(); } diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java index af941f27..9d9e8648 100644 --- a/src/itdelatrisu/opsu/states/SongMenu.java +++ b/src/itdelatrisu/opsu/states/SongMenu.java @@ -515,15 +515,18 @@ public class SongMenu extends BasicGameState { float logoSize = footerHeight * 2f; logo = logo.getScaledCopy(logoSize / logo.getWidth()); Double position = MusicController.getBeatProgress(); - float x = width - footerHeight * 0.60f; + float x = width - footerHeight * 0.61f; float y = height - footerHeight * 0.40f; if (position != null) { - Image ghostLogo = logo.getScaledCopy((float) (1 - (0 - position) * 0.075)); - logo = logo.getScaledCopy((float) (1 - (position) * 0.075)); + Image ghostLogo = logo.getScaledCopy((float) (1 - (0 - position) * 0.15)); + logo = logo.getScaledCopy((float) (1 - (position) * 0.15)); logoSize = logo.getWidth(); logo.draw(x - logoSize / 2, y - logoSize / 2); logoSize = ghostLogo.getWidth(); + float a = Colors.GHOST_LOGO.a; + Colors.GHOST_LOGO.a *= (1d - position); ghostLogo.draw(x - logoSize / 2, y - logoSize / 2, Colors.GHOST_LOGO); + Colors.GHOST_LOGO.a = a; } else { logo.draw(x - logoSize / 2, y - logoSize / 2); } diff --git a/src/itdelatrisu/opsu/ui/Colors.java b/src/itdelatrisu/opsu/ui/Colors.java index 96f7a6ae..70a836d7 100644 --- a/src/itdelatrisu/opsu/ui/Colors.java +++ b/src/itdelatrisu/opsu/ui/Colors.java @@ -48,7 +48,7 @@ public class Colors { BLACK_BG_NORMAL = new Color(0, 0, 0, 0.25f), BLACK_BG_HOVER = new Color(0, 0, 0, 0.5f), BLACK_BG_FOCUS = new Color(0, 0, 0, 0.75f), - GHOST_LOGO = new Color(1.0f, 1.0f, 1.0f, 0.15f); + GHOST_LOGO = new Color(1.0f, 1.0f, 1.0f, 0.25f); // This class should not be instantiated.