From 95ffae883b58a1bef5c90285ac60623875abd286 Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 1 Jul 2018 21:23:24 +0200 Subject: [PATCH] mainmenu: put now playing in top right with background and img --- res/music-np-bg-black.png | Bin 0 -> 420 bytes res/music-np-bg-white.png | Bin 0 -> 360 bytes res/music-np.pdn | Bin 0 -> 35645 bytes res/music-np.png | Bin 0 -> 3748 bytes src/itdelatrisu/opsu/GameImage.java | 3 ++ src/itdelatrisu/opsu/states/MainMenu.java | 41 ++++++++++++++-------- 6 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 res/music-np-bg-black.png create mode 100644 res/music-np-bg-white.png create mode 100644 res/music-np.pdn create mode 100644 res/music-np.png diff --git a/res/music-np-bg-black.png b/res/music-np-bg-black.png new file mode 100644 index 0000000000000000000000000000000000000000..5c83f2d029b7f9c981a44dd73f8648b20b5c8137 GIT binary patch literal 420 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 ANB{r; literal 0 HcmV?d00001 diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java index 0d2fc0d4..dfe5dcbb 100644 --- a/src/itdelatrisu/opsu/GameImage.java +++ b/src/itdelatrisu/opsu/GameImage.java @@ -347,6 +347,9 @@ public enum GameImage { MUSIC_PAUSE ("music-pause", "png", false, false), MUSIC_NEXT ("music-next", "png", false, false), MUSIC_PREVIOUS ("music-previous", "png", false, false), + MUSIC_NOWPLAYING ("music-np", "png", false, false), + MUSIC_NOWPLAYING_BG_BLACK ("music-np-bg-black", "png", false, false), + MUSIC_NOWPLAYING_BG_WHITE ("music-np-bg-white", "png", false, false), DOWNLOADS ("downloads", "png", false, false) { @Override diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java index 962b632e..993ecc34 100644 --- a/src/itdelatrisu/opsu/states/MainMenu.java +++ b/src/itdelatrisu/opsu/states/MainMenu.java @@ -233,6 +233,11 @@ public class MainMenu extends BaseOpsuState { int width = displayContainer.width; int height = displayContainer.height; + final float textMarginX = width * 0.015f; + final float textTopMarginY = height * 0.01f; + final float textBottomMarginY = height * 0.015f; + final float textLineHeight = Fonts.MEDIUM.getLineHeight() * 0.925f; + // draw background Beatmap beatmap = MusicController.getBeatmap(); if (OPTION_DYNAMIC_BACKGROUND.state && @@ -303,6 +308,24 @@ public class MainMenu extends BaseOpsuState { Image ghostLogo = GameImage.MENU_LOGO.getImage().getScaledCopy(ghostScale); ghostLogo.setAlpha(0.25f); ghostLogo.drawCentered(logo.getX(), logo.getY(), color); + + // now playing + if (OPTION_SHOW_UNICODE.state) { + Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.titleUnicode); + Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.artistUnicode); + } + final String trackText = beatmap.getArtist() + ": " + beatmap.getTitle(); + final float textWidth = Fonts.MEDIUM.getWidth(trackText); + final float npheight = Fonts.MEDIUM.getLineHeight() * 1.15f; + float npx = width - textWidth - textMarginX; + GameImage.MUSIC_NOWPLAYING_BG_BLACK.getImage().draw(npx, 0, width - npx, npheight); + final float npTextX = npx; + final Image np = GameImage.MUSIC_NOWPLAYING.getImage(); + final float npscale = npheight / np.getHeight(); + npx -= np.getWidth() * npscale; + GameImage.MUSIC_NOWPLAYING_BG_WHITE.getImage().draw(npx, npheight, width - npx, 2); + np.draw(npx, 0, npscale); + Fonts.MEDIUM.drawString(npTextX, 0, trackText); // draw music buttons if (MusicController.isPlaying()) @@ -350,31 +373,19 @@ public class MainMenu extends BaseOpsuState { } // draw text - float marginX = width * 0.015f, topMarginY = height * 0.01f, bottomMarginY = height * 0.015f; g.setFont(Fonts.MEDIUM); - float lineHeight = Fonts.MEDIUM.getLineHeight() * 0.925f; final String beatmapText = String.format( "You have %d beatmaps (%d songs) available!", BeatmapSetList.get().getMapCount(), BeatmapSetList.get().getMapSetCount() ); - g.drawString(beatmapText, marginX, topMarginY); - if (MusicController.isTrackLoading()) { - g.drawString("Track loading...", marginX, topMarginY + lineHeight); - } else if (MusicController.trackExists()) { - if (OPTION_SHOW_UNICODE.state) { - Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.titleUnicode); - Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.artistUnicode); - } - g.drawString((MusicController.isPlaying()) ? "Now Playing:" : "Paused:", marginX, topMarginY + lineHeight); - g.drawString(String.format("%s: %s", beatmap.getArtist(), beatmap.getTitle()), marginX + 25, topMarginY + (lineHeight * 2)); - } + g.drawString(beatmapText, textMarginX, textTopMarginY); g.drawString(String.format("opsu! has been running for %s.", Utils.getTimeString((int) (System.currentTimeMillis() - programStartTime) / 1000)), - marginX, height - bottomMarginY - (lineHeight * 2)); + textMarginX, height - textBottomMarginY - (textLineHeight * 2)); g.drawString(String.format("It is currently %s.", new SimpleDateFormat("HH:mm").format(new Date())), - marginX, height - bottomMarginY - lineHeight); + textMarginX, height - textBottomMarginY - textLineHeight); UI.draw(g); }