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

animate the now playing bar width changes

Browse Source
This commit is contained in:
yugecin 2018-07-01 22:49:42 +02:00
parent 45e1438d4e
commit 7c763f4f66
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,9 @@ public class MainMenu extends BaseOpsuState {
/** Logo button alpha levels. */ /** Logo button alpha levels. */
private AnimatedValue logoButtonAlpha; private AnimatedValue logoButtonAlpha;
/** Now playing position vlaue. */
private final AnimatedValue nowPlayingPosition;
/** Main "Play" and "Exit" buttons. */ /** Main "Play" and "Exit" buttons. */
private MenuButton playButton, exitButton; private MenuButton playButton, exitButton;
@ -136,6 +139,10 @@ public class MainMenu extends BaseOpsuState {
private LinkedList<PulseData> pulseData = new LinkedList<>(); private LinkedList<PulseData> pulseData = new LinkedList<>();
private float lastPulseProgress; private float lastPulseProgress;
public MainMenu() {
this.nowPlayingPosition = new AnimatedValue(1000, 0, 0, OUT_QUART);
}
@Override @Override
protected void revalidate() { protected void revalidate() {
@ -336,18 +343,23 @@ public class MainMenu extends BaseOpsuState {
Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.titleUnicode); Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.titleUnicode);
Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.artistUnicode); Fonts.loadGlyphs(Fonts.MEDIUM, beatmap.artistUnicode);
} }
final Image np = GameImage.MUSIC_NOWPLAYING.getImage();
final String trackText = beatmap.getArtist() + ": " + beatmap.getTitle(); final String trackText = beatmap.getArtist() + ": " + beatmap.getTitle();
final float textWidth = Fonts.MEDIUM.getWidth(trackText); final float textWidth = Fonts.MEDIUM.getWidth(trackText);
final float npheight = Fonts.MEDIUM.getLineHeight() * 1.15f; 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(); final float npscale = npheight / np.getHeight();
npx -= np.getWidth() * npscale; final float npwidth = np.getWidth() * npscale;
GameImage.MUSIC_NOWPLAYING_BG_WHITE.getImage().draw(npx, npheight, width - npx, 2); float totalWidth = textMarginX + textWidth + npwidth;
np.draw(npx, 0, npscale); if (this.nowPlayingPosition.getMax() != totalWidth) {
Fonts.MEDIUM.drawString(npTextX, 0, trackText); final float current = this.nowPlayingPosition.getValue();
this.nowPlayingPosition.setValues(current, totalWidth);
}
final float npimgx = width - this.nowPlayingPosition.getValue();
final float npx = npimgx + npwidth;
MUSIC_NOWPLAYING_BG_BLACK.getImage().draw(npx, 0, width - npx, npheight);
MUSIC_NOWPLAYING_BG_WHITE.getImage().draw(npimgx, npheight, width - npimgx, 2);
np.draw(npimgx, 0, npscale);
Fonts.MEDIUM.drawString(npx, 0, trackText);
// draw music buttons // draw music buttons
for (MenuButton b : this.musicButtons) { for (MenuButton b : this.musicButtons) {
@ -521,6 +533,8 @@ public class MainMenu extends BaseOpsuState {
(status == Updater.Status.UPDATE_DOWNLOADED && restartButton.contains(mouseX, mouseY))) (status == Updater.Status.UPDATE_DOWNLOADED && restartButton.contains(mouseX, mouseY)))
UI.updateTooltip(delta, status.getDescription(), true); UI.updateTooltip(delta, status.getDescription(), true);
} }
nowPlayingPosition.update(delta);
} }
@Override @Override
@ -531,6 +545,7 @@ public class MainMenu extends BaseOpsuState {
logoOpen.setTime(0); logoOpen.setTime(0);
logoClose.setTime(0); logoClose.setTime(0);
logoButtonAlpha.setTime(0); logoButtonAlpha.setTime(0);
nowPlayingPosition.setTime(0);
logoTimer = 0; logoTimer = 0;
logoState = LogoState.DEFAULT; logoState = LogoState.DEFAULT;

20
src/itdelatrisu/opsu/ui/animations/AnimatedValue.java
View File

@ -57,6 +57,26 @@ public class AnimatedValue {
this.diff = max - min; this.diff = max - min;
this.eqn = eqn; this.eqn = eqn;
} }
/**
* Change the from and to values
* @param min start value
* @param max end value
*/
public void setValues(float min, float max) {
this.base = min;
this.value = min;
this.diff = max - min;
this.setTime(0);
}
/**
* Gets the max (end) value
* @return the max (end) value
*/
public float getMax() {
return this.base + this.diff;
}
/** /**
* Returns the current value. * Returns the current value.