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

Animate the music icon in the song menu. (follow-up to c5cc43a)

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-09-05 19:46:52 -04:00
parent c5cc43acfc
commit 5ff35d355b
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,6 +226,9 @@ public class SongMenu extends BasicGameState {
/** Timer for animations when a new song node is selected. */ /** Timer for animations when a new song node is selected. */
private AnimatedValue songChangeTimer = new AnimatedValue(900, 0f, 1f, AnimationEquation.OUT_QUAD); private AnimatedValue songChangeTimer = new AnimatedValue(900, 0f, 1f, AnimationEquation.OUT_QUAD);
/** Timer for the music icon animation when a new song node is selected. */
private AnimatedValue musicIconBounceTimer = new AnimatedValue(350, 0f, 1f, AnimationEquation.LINEAR);
/** /**
* Beatmaps whose difficulties were recently computed (if flag is non-null). * Beatmaps whose difficulties were recently computed (if flag is non-null).
* Unless the Boolean flag is null, then upon removal, the beatmap's objects will * Unless the Boolean flag is null, then upon removal, the beatmap's objects will
@@ -401,8 +404,13 @@ public class SongMenu extends BasicGameState {
Image musicNote = GameImage.MENU_MUSICNOTE.getImage(); Image musicNote = GameImage.MENU_MUSICNOTE.getImage();
if (MusicController.isTrackLoading()) if (MusicController.isTrackLoading())
loader.draw(marginX, marginY); loader.draw(marginX, marginY);
else else {
musicNote.draw(marginX, marginY); float t = musicIconBounceTimer.getValue() * 2f;
if (t > 1)
t = 2f - t;
float musicNoteScale = 1f + 0.3f * t;
musicNote.getScaledCopy(musicNoteScale).drawCentered(marginX + musicNote.getWidth() / 2f, marginY + musicNote.getHeight() / 2f);
}
int iconWidth = musicNote.getWidth(); int iconWidth = musicNote.getWidth();
// song info text // song info text
@@ -585,8 +593,10 @@ public class SongMenu extends BasicGameState {
if (!focusNodeBeatmap.isBackgroundLoading()) if (!focusNodeBeatmap.isBackgroundLoading())
bgAlpha.update(delta); bgAlpha.update(delta);
// song change timer // song change timers
songChangeTimer.update(delta); songChangeTimer.update(delta);
if (!MusicController.isTrackLoading())
musicIconBounceTimer.update(delta);
} }
// star stream // star stream
@@ -1045,6 +1055,7 @@ public class SongMenu extends BasicGameState {
songInfo = null; songInfo = null;
bgAlpha.setTime(bgAlpha.getDuration()); bgAlpha.setTime(bgAlpha.getDuration());
songChangeTimer.setTime(songChangeTimer.getDuration()); songChangeTimer.setTime(songChangeTimer.getDuration());
musicIconBounceTimer.setTime(musicIconBounceTimer.getDuration());
starStream.clear(); starStream.clear();
// reset song stack // reset song stack
@@ -1248,6 +1259,7 @@ public class SongMenu extends BasicGameState {
hoverIndex = -1; hoverIndex = -1;
songInfo = null; songInfo = null;
songChangeTimer.setTime(0); songChangeTimer.setTime(0);
musicIconBounceTimer.setTime(0);
BeatmapSetNode oldFocus = focusNode; BeatmapSetNode oldFocus = focusNode;
// expand node before focusing it // expand node before focusing it