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

main menu layout changes

Browse Source 
Slighty changed black bars height
Put now playing text near the controls
Changed amount of beatmaps available sentence
This commit is contained in:
yugecin 2018-06-25 23:28:30 +02:00
parent c356d75def
commit 11fd501a1e
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,10 +240,11 @@ public class MainMenu extends BaseOpsuState {
// top/bottom horizontal bars // top/bottom horizontal bars
float oldAlpha = Colors.BLACK_ALPHA.a; float oldAlpha = Colors.BLACK_ALPHA.a;
Colors.BLACK_ALPHA.a = 0.2f; Colors.BLACK_ALPHA.a = 0.4f;
g.setColor(Colors.BLACK_ALPHA); g.setColor(Colors.BLACK_ALPHA);
g.fillRect(0, 0, width, height / 9f); final float barheight = height * 0.1125f;
g.fillRect(0, height * 8 / 9f, width, height / 9f); g.fillRect(0, 0, width, barheight);
g.fillRect(0, height - barheight, width, barheight);
Colors.BLACK_ALPHA.a = oldAlpha; Colors.BLACK_ALPHA.a = oldAlpha;
// draw star fountain // draw star fountain
@ -274,7 +275,8 @@ public class MainMenu extends BaseOpsuState {
} }
float ghostScale = logo.getLastScale() / scale * 1.05f; float ghostScale = logo.getLastScale() / scale * 1.05f;
Image ghostLogo = GameImage.MENU_LOGO.getImage().getScaledCopy(ghostScale); Image ghostLogo = GameImage.MENU_LOGO.getImage().getScaledCopy(ghostScale);
ghostLogo.drawCentered(logo.getX(), logo.getY(), Colors.GHOST_LOGO); ghostLogo.setAlpha(0.25f);
ghostLogo.drawCentered(logo.getX(), logo.getY(), color);
// draw music buttons // draw music buttons
if (MusicController.isPlaying()) if (MusicController.isPlaying())
@ -325,8 +327,12 @@ public class MainMenu extends BaseOpsuState {
float marginX = width * 0.015f, topMarginY = height * 0.01f, bottomMarginY = height * 0.015f; float marginX = width * 0.015f, topMarginY = height * 0.01f, bottomMarginY = height * 0.015f;
g.setFont(Fonts.MEDIUM); g.setFont(Fonts.MEDIUM);
float lineHeight = Fonts.MEDIUM.getLineHeight() * 0.925f; float lineHeight = Fonts.MEDIUM.getLineHeight() * 0.925f;
g.drawString(String.format("Loaded %d songs and %d beatmaps.", final String beatmapText = String.format(
BeatmapSetList.get().getMapSetCount(), BeatmapSetList.get().getMapCount()), marginX, topMarginY); "You have %d beatmaps (%d songs) available!",
BeatmapSetList.get().getMapCount(),
BeatmapSetList.get().getMapSetCount()
);
g.drawString(beatmapText, marginX, topMarginY);
if (MusicController.isTrackLoading()) { if (MusicController.isTrackLoading()) {
g.drawString("Track loading...", marginX, topMarginY + lineHeight); g.drawString("Track loading...", marginX, topMarginY + lineHeight);
} else if (MusicController.trackExists()) { } else if (MusicController.trackExists()) {

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

@ -561,10 +561,8 @@ public class SongMenu extends ComplexOpsuState {
footerLogoButton.draw(Color.white, 1f - expand); footerLogoButton.draw(Color.white, 1f - expand);
Image ghostLogo = GameImage.MENU_LOGO.getImage(); Image ghostLogo = GameImage.MENU_LOGO.getImage();
ghostLogo = ghostLogo.getScaledCopy((1f + expand) * footerLogoSize / ghostLogo.getWidth()); ghostLogo = ghostLogo.getScaledCopy((1f + expand) * footerLogoSize / ghostLogo.getWidth());
float oldGhostAlpha = Colors.GHOST_LOGO.a; ghostLogo.setAlpha(0.25f * (1f - position));
Colors.GHOST_LOGO.a *= (1f - position); ghostLogo.drawCentered(footerLogoButton.getX(), footerLogoButton.getY());
ghostLogo.drawCentered(footerLogoButton.getX(), footerLogoButton.getY(), Colors.GHOST_LOGO);
Colors.GHOST_LOGO.a = oldGhostAlpha;
} }
// header // header

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

@ -53,8 +53,7 @@ public class Colors {
BUB_WHITE = new Color(220, 220, 220), BUB_WHITE = new Color(220, 220, 220),
BUB_PURPLE = new Color(94, 46, 149), BUB_PURPLE = new Color(94, 46, 149),
BUB_RED = new Color(141, 49, 16), BUB_RED = new Color(141, 49, 16),
BUB_ORANGE = new Color(138, 72, 51), BUB_ORANGE = new Color(138, 72, 51);
GHOST_LOGO = new Color(1.0f, 1.0f, 1.0f, 0.25f);
// This class should not be instantiated. // This class should not be instantiated.
private Colors() {} private Colors() {}