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

added MusicController#getBeatProgress

Browse Source
This commit is contained in:
yugecin 2016-12-18 23:31:17 +01:00
parent 474b40750e
commit 77c6dfd65a
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/itdelatrisu/opsu/audio/MusicController.java
View File

@ -22,6 +22,7 @@ import itdelatrisu.opsu.ErrorHandler;
import itdelatrisu.opsu.Options; import itdelatrisu.opsu.Options;
import itdelatrisu.opsu.beatmap.Beatmap; import itdelatrisu.opsu.beatmap.Beatmap;
import itdelatrisu.opsu.beatmap.BeatmapParser; import itdelatrisu.opsu.beatmap.BeatmapParser;
import itdelatrisu.opsu.beatmap.TimingPoint;
import itdelatrisu.opsu.ui.UI; import itdelatrisu.opsu.ui.UI;
import java.io.File; import java.io.File;
@ -183,6 +184,39 @@ public class MusicController {
*/ */
public static Beatmap getBeatmap() { return lastBeatmap; } public static Beatmap getBeatmap() { return lastBeatmap; }
/**
* Gets the progress of the current beat.
* @return progress as a value in [0, 1], where 0 means a beat just happened and 1 means the next beat is coming right now.
*/
public static Float getBeatProgress() {
if (!isPlaying() || getBeatmap() == null) {
return null;
}
Beatmap map = getBeatmap();
if (map.timingPoints == null) {
return null;
}
int trackposition = getPosition();
TimingPoint p = null;
double beatlen = 0d;
int time = 0;
for (TimingPoint pts : map.timingPoints) {
if (pts.getTime() > getPosition()) {
break;
}
p = pts;
if (!p.isInherited() && p.getBeatLength() > 0) {
beatlen = p.getBeatLength();
time = p.getTime();
}
}
if (p == null) {
return null;
}
double beatLength = beatlen * 100d;
return (float) ((((trackposition - time) * 100) % beatLength) / beatLength);
}
/** /**
* Returns true if the current track is playing. * Returns true if the current track is playing.
*/ */