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

mainmenu: push down effect to logo when clicking

Browse Source
This commit is contained in:
yugecin 2018-07-07 10:29:28 +02:00
parent a2634ac093
commit 5b7ee4e11c
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,8 @@ public class MainMenu extends BaseOpsuState {
private int lastMouseX; private int lastMouseX;
private int lastMouseY; private int lastMouseY;
private AnimatedValue logoClickScale;
/** Logo button alpha levels. */ /** Logo button alpha levels. */
private AnimatedValue logoButtonAlpha; private AnimatedValue logoButtonAlpha;
@ -149,6 +151,7 @@ public class MainMenu extends BaseOpsuState {
public MainMenu() { public MainMenu() {
this.nowPlayingPosition = new AnimatedValue(1000, 0, 0, OUT_QUART); this.nowPlayingPosition = new AnimatedValue(1000, 0, 0, OUT_QUART);
this.logoClickScale = new AnimatedValue(300, .9f, 1f, OUT_QUAD);
this.timeFormat = new SimpleDateFormat("HH:mm"); this.timeFormat = new SimpleDateFormat("HH:mm");
} }
@ -300,11 +303,12 @@ public class MainMenu extends BaseOpsuState {
} }
// draw logo (pulsing) // draw logo (pulsing)
final float clickScale = this.logoClickScale.getValue();
Color color = OPTION_COLOR_MAIN_MENU_LOGO.state ? Cursor.lastCursorColor : Color.white; Color color = OPTION_COLOR_MAIN_MENU_LOGO.state ? Cursor.lastCursorColor : Color.white;
for (PulseData pd : this.pulseData) { for (PulseData pd : this.pulseData) {
final float progress = OUT_CUBIC.calc(pd.position / 1000f); final float progress = OUT_CUBIC.calc(pd.position / 1000f);
final float scale = pd.initialScale + (0.432f * progress); final float scale = (pd.initialScale + (0.432f * progress)) * clickScale;
final Image p = GameImage.MENU_LOGO_PULSE.getImage().getScaledCopy(scale); final Image p = MENU_LOGO_PULSE.getScaledImage(scale);
p.setAlpha(0.15f * (1f - IN_QUAD.calc(progress))); p.setAlpha(0.15f * (1f - IN_QUAD.calc(progress)));
p.drawCentered(logo.getX(), logo.getY(), color); p.drawCentered(logo.getX(), logo.getY(), color);
} }
@ -326,15 +330,14 @@ public class MainMenu extends BaseOpsuState {
} else { } else {
smoothExpandProgress = (position - 0.05f) / 0.95f; smoothExpandProgress = (position - 0.05f) / 0.95f;
} }
logo.draw(color, 0.9726f + smoothExpandProgress * 0.0274f); logo.draw(color, (0.9726f + smoothExpandProgress * 0.0274f) * clickScale);
if (renderPiece) { if (renderPiece) {
Image piece = GameImage.MENU_LOGO_PIECE.getImage(); final Image piece = MENU_LOGO_PIECE.getScaledImage(hoverScale * clickScale);
piece = piece.getScaledCopy(hoverScale);
piece.rotate(position * 360); piece.rotate(position * 360);
piece.drawCentered(logo.getX(), logo.getY(), color); piece.drawCentered(logo.getX(), logo.getY(), color);
} }
final float ghostScale = hoverScale * 1.0186f - smoothExpandProgress * 0.0186f; final float ghostScale = hoverScale * 1.0186f - smoothExpandProgress * 0.0186f;
Image ghostLogo = GameImage.MENU_LOGO.getImage().getScaledCopy(ghostScale); Image ghostLogo = MENU_LOGO.getScaledImage(ghostScale * clickScale);
ghostLogo.setAlpha(0.25f); ghostLogo.setAlpha(0.25f);
ghostLogo.drawCentered(logo.getX(), logo.getY(), color); ghostLogo.drawCentered(logo.getX(), logo.getY(), color);
@ -529,6 +532,7 @@ public class MainMenu extends BaseOpsuState {
logo.setX(centerX - logoPosition.getValue()); logo.setX(centerX - logoPosition.getValue());
break; break;
} }
this.logoClickScale.update(delta);
// tooltips // tooltips
if (musicPositionBarContains(mouseX, mouseY)) if (musicPositionBarContains(mouseX, mouseY))
@ -562,6 +566,7 @@ public class MainMenu extends BaseOpsuState {
logoButtonAlpha.setTime(0); logoButtonAlpha.setTime(0);
nowPlayingPosition.setTime(0); nowPlayingPosition.setTime(0);
logoState = LogoState.DEFAULT; logoState = LogoState.DEFAULT;
this.logoClickScale.setTime(this.logoClickScale.getDuration());
UI.enter(); UI.enter();
if (!enterNotification) { if (!enterNotification) {
@ -720,13 +725,19 @@ public class MainMenu extends BaseOpsuState {
if (logo.contains(x, y, 0.25f)) { if (logo.contains(x, y, 0.25f)) {
this.openLogo(); this.openLogo();
SoundController.playSound(SoundEffect.MENUHIT); SoundController.playSound(SoundEffect.MENUHIT);
this.logoClickScale.setTime(0);
return true; return true;
} }
} }
// other button actions (if visible) // other button actions (if visible)
else if (logoState == LogoState.OPEN || logoState == LogoState.OPENING) { else if (logoState == LogoState.OPEN || logoState == LogoState.OPENING) {
if (logo.contains(x, y, 0.25f) || playButton.contains(x, y, 0.25f)) { boolean logocontains = false;
if (logo.contains(x, y, 0.25f)) {
logocontains = true;
this.logoClickScale.setTime(0);
}
if (logocontains || playButton.contains(x, y, 0.25f)) {
SoundController.playSound(SoundEffect.MENUHIT); SoundController.playSound(SoundEffect.MENUHIT);
enterSongMenu(); enterSongMenu();
return true; return true;