From f7e42c271f8d0103994c873205457b8f73892570 Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 18 Dec 2016 23:41:36 +0100 Subject: [PATCH] make the main menu logo pulse --- src/itdelatrisu/opsu/states/MainMenu.java | 13 ++++++++++++- src/itdelatrisu/opsu/ui/Colors.java | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java index 8eb78819..40fbe44c 100644 --- a/src/itdelatrisu/opsu/states/MainMenu.java +++ b/src/itdelatrisu/opsu/states/MainMenu.java @@ -256,7 +256,18 @@ public class MainMenu extends BasicGameState { playButton.draw(); exitButton.draw(); } - logo.draw(); + + // logo + Float position = MusicController.getBeatProgress(); + if (position == null) { + position = System.currentTimeMillis() % 1000 / 1000f; + } + float scale = 1f - (0f - position) * 0.05f; + logo.draw(Color.white, scale); + Image ghostLogo = GameImage.MENU_LOGO.getImage().getScaledCopy(logo.getCurrentScale() / scale * 1.05f); + float scaleposmodx = ghostLogo.getWidth() / 2; + float scaleposmody = ghostLogo.getHeight() / 2; + ghostLogo.draw(logo.getX() - scaleposmodx, logo.getY() - scaleposmody, Colors.GHOST_LOGO); // draw music buttons if (MusicController.isPlaying()) diff --git a/src/itdelatrisu/opsu/ui/Colors.java b/src/itdelatrisu/opsu/ui/Colors.java index 7f00603a..eff7ba57 100644 --- a/src/itdelatrisu/opsu/ui/Colors.java +++ b/src/itdelatrisu/opsu/ui/Colors.java @@ -45,7 +45,8 @@ public class Colors { BLUE_SCOREBOARD = new Color(133, 208, 212), 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); + BLACK_BG_FOCUS = new Color(0, 0, 0, 0.75f), + GHOST_LOGO = new Color(1.0f, 1.0f, 1.0f, 0.25f); // This class should not be instantiated. private Colors() {}