Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ghost logo adjustments

Browse Source
This commit is contained in:
yugecin 2016-12-18 20:35:08 +01:00
parent 353fff9f0c
commit 64a3a85eb0
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/itdelatrisu/opsu/states/MainMenu.java
View File

@ -284,7 +284,10 @@ public class MainMenu extends BasicGameState {
Image logoCopy = GameImage.MENU_LOGO.getImage().getScaledCopy(logo.getCurrentScale() / (float) scale * 1.05f); Image logoCopy = GameImage.MENU_LOGO.getImage().getScaledCopy(logo.getCurrentScale() / (float) scale * 1.05f);
scaleposmodx = logoCopy.getWidth() / 2; scaleposmodx = logoCopy.getWidth() / 2;
scaleposmody = logoCopy.getHeight() / 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); logoCopy.draw(logo.getX() - scaleposmodx, logo.getY() - scaleposmody, Colors.GHOST_LOGO);
Colors.GHOST_LOGO.a = a;
} else { } else {
logo.draw(); logo.draw();
} }

9
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -515,15 +515,18 @@ public class SongMenu extends BasicGameState {
float logoSize = footerHeight * 2f; float logoSize = footerHeight * 2f;
logo = logo.getScaledCopy(logoSize / logo.getWidth()); logo = logo.getScaledCopy(logoSize / logo.getWidth());
Double position = MusicController.getBeatProgress(); Double position = MusicController.getBeatProgress();
float x = width - footerHeight * 0.60f; float x = width - footerHeight * 0.61f;
float y = height - footerHeight * 0.40f; float y = height - footerHeight * 0.40f;
if (position != null) { if (position != null) {
Image ghostLogo = logo.getScaledCopy((float) (1 - (0 - position) * 0.075)); Image ghostLogo = logo.getScaledCopy((float) (1 - (0 - position) * 0.15));
logo = logo.getScaledCopy((float) (1 - (position) * 0.075)); logo = logo.getScaledCopy((float) (1 - (position) * 0.15));
logoSize = logo.getWidth(); logoSize = logo.getWidth();
logo.draw(x - logoSize / 2, y - logoSize / 2); logo.draw(x - logoSize / 2, y - logoSize / 2);
logoSize = ghostLogo.getWidth(); 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); ghostLogo.draw(x - logoSize / 2, y - logoSize / 2, Colors.GHOST_LOGO);
Colors.GHOST_LOGO.a = a;
} else { } else {
logo.draw(x - logoSize / 2, y - logoSize / 2); logo.draw(x - logoSize / 2, y - logoSize / 2);
} }

2
src/itdelatrisu/opsu/ui/Colors.java
View File

@ -48,7 +48,7 @@ public class Colors {
BLACK_BG_NORMAL = new Color(0, 0, 0, 0.25f), BLACK_BG_NORMAL = new Color(0, 0, 0, 0.25f),
BLACK_BG_HOVER = new Color(0, 0, 0, 0.5f), 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.15f); GHOST_LOGO = new Color(1.0f, 1.0f, 1.0f, 0.25f);
// This class should not be instantiated. // This class should not be instantiated.