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

Beatmap downloader improvements and fixes.

Browse Source 
Updates:
- Added some buttons to downloads menu: clear inactive downloads, import beatmaps, reset search, and show/hide unranked maps.
- Small changes to OsuParser, OszUnpacker, and OsuGroupList (mostly adding return values) to allow parsing only newly unpacked beatmaps.
- Added alpha fade hover effect to MenuButton, as an alternative to expanding (used for 3-part menu buttons).
- Added text rendering fields to MenuButton (also for the 3-part menu buttons).
- Added sound effects to downloads menu.

Fixes:
- Check downloads for illegal filename characters, and remove them if necessary.
- The number of results and downloads shown now supports all resolutions.
- Confirmation dialog no longer appears when restarting the application (since downloads are static).
- Do not set a focus node immediately if the theme song will be played.
- Always play the theme song if no songs are loaded (even if disabled in settings).

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-02-02 00:15:16 -05:00
parent cfc0449ab2
commit ec90d6fd03
20 changed files with 517 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/itdelatrisu/opsu/states/MainMenuExit.java
View File

@@ -51,6 +51,7 @@ public class MainMenuExit extends BasicGameState {
// game-related variables
private GameContainer container;
private StateBasedGame game;
private Input input;
private int state;
public MainMenuExit(int state) {
@@ -62,6 +63,7 @@ public class MainMenuExit extends BasicGameState {
throws SlickException {
this.container = container;
this.game = game;
this.input = container.getInput();
int width = container.getWidth();
int height = container.getHeight();
@@ -70,14 +72,19 @@ public class MainMenuExit extends BasicGameState {
// initialize buttons
Image button = GameImage.MENU_BUTTON_MID.getImage();
button = button.getScaledCopy(width / 2, button.getHeight());
Image buttonL = GameImage.MENU_BUTTON_LEFT.getImage();
Image buttonR = GameImage.MENU_BUTTON_RIGHT.getImage();
yesButton = new MenuButton(button, buttonL, buttonR,
width / 2f + centerOffset, height * 0.2f
);
yesButton.setText("1. Yes", Utils.FONT_XLARGE, Color.white);
noButton = new MenuButton(button, buttonL, buttonR,
width / 2f - centerOffset, height * 0.2f + (button.getHeight() * 1.25f)
);
noButton.setText("2. No", Utils.FONT_XLARGE, Color.white);
yesButton.setHoverFade();
noButton.setHoverFade();
}
@Override
@@ -92,16 +99,6 @@ public class MainMenuExit extends BasicGameState {
// draw buttons
yesButton.draw(Color.green);
noButton.draw(Color.red);
Utils.FONT_XLARGE.drawString(
yesButton.getX() - (Utils.FONT_XLARGE.getWidth("1. Yes") / 2f),
yesButton.getY() - (Utils.FONT_XLARGE.getLineHeight() / 2f),
"1. Yes", Color.white
);
Utils.FONT_XLARGE.drawString(
noButton.getX() - (Utils.FONT_XLARGE.getWidth("2. No") / 2f),
noButton.getY() - (Utils.FONT_XLARGE.getLineHeight() / 2f),
"2. No", Color.white
);
Utils.drawVolume(g);
Utils.drawFPS();
@@ -113,6 +110,9 @@ public class MainMenuExit extends BasicGameState {
throws SlickException {
Utils.updateCursor(delta);
Utils.updateVolumeDisplay(delta);
int mouseX = input.getMouseX(), mouseY = input.getMouseY();
yesButton.hoverUpdate(delta, mouseX, mouseY);
noButton.hoverUpdate(delta, mouseX, mouseY);
// move buttons to center
float yesX = yesButton.getX(), noX = noButton.getX();
@@ -160,5 +160,7 @@ public class MainMenuExit extends BasicGameState {
float center = container.getWidth() / 2f;
yesButton.setX(center - centerOffset);
noButton.setX(center + centerOffset);
yesButton.resetHover();
noButton.resetHover();
}
}