sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

More inversion for logic simplification.

Browse Source
This commit is contained in:
smoogipooo
2017-05-22 17:15:23 +09:00
parent f81ffa636d
commit 70d7f61f7c
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Graphics/Containers/BeatSyncedContainer.cs
View File

@ -11,40 +11,42 @@ namespace osu.Game.Graphics.Containers
{ {
public class BeatSyncedContainer : Container public class BeatSyncedContainer : Container
{ {
/// <summary>
/// A new beat will not be sent if the time since the beat is larger than this tolerance.
/// </summary>
private const int seek_tolerance = 20;
private Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>(); private Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private int lastBeat; private int lastBeat;
private double lastTimingPointStart; private ControlPoint lastControlPoint;
//This is to avoid sending new beats when not at the very start of the beat
private const int seek_tolerance = 20;
private const double min_beat_length = 1E-100;
protected override void Update() protected override void Update()
{ {
if (beatmap.Value?.Track == null) if (beatmap.Value?.Track == null)
return; return;
double trackCurrentTime = beatmap.Value.Track.CurrentTime; double currentTrackTime = beatmap.Value.Track.CurrentTime;
ControlPoint overridePoint; ControlPoint overridePoint;
ControlPoint controlPoint = beatmap.Value.Beatmap.TimingInfo.TimingPointAt(trackCurrentTime, out overridePoint); ControlPoint controlPoint = beatmap.Value.Beatmap.TimingInfo.TimingPointAt(currentTrackTime, out overridePoint);
if (controlPoint == null)
return;
bool kiai = (overridePoint ?? controlPoint).KiaiMode; bool kiai = (overridePoint ?? controlPoint).KiaiMode;
int beat = controlPoint.BeatLength > 0 ? (int)((currentTrackTime - controlPoint.Time) / controlPoint.BeatLength) : 0;
double beatLength = controlPoint.BeatLength; // The beats before the start of the first control point are off by 1, this should do the trick
double timingPointStart = controlPoint.Time; if (currentTrackTime < controlPoint.Time)
int beat = beatLength > min_beat_length ? (int)((trackCurrentTime - timingPointStart) / beatLength) : 0;
//The beats before the start of the first control point are off by 1, this should do the trick
if (trackCurrentTime < timingPointStart)
beat--; beat--;
if ((timingPointStart != lastTimingPointStart || beat != lastBeat) && (int)((trackCurrentTime - timingPointStart) % beatLength) <= seek_tolerance) if (controlPoint == lastControlPoint && beat == lastBeat)
OnNewBeat(beat, beatLength, controlPoint.TimeSignature, kiai); return;
if ((currentTrackTime - controlPoint.Time) % controlPoint.BeatLength > seek_tolerance)
return;
OnNewBeat(beat, controlPoint.BeatLength, controlPoint.TimeSignature, kiai);
lastBeat = beat; lastBeat = beat;
lastTimingPointStart = timingPointStart; lastControlPoint = controlPoint;
} }
protected virtual void OnNewBeat(int newBeat, double beatLength, TimeSignatures timeSignature, bool kiai) protected virtual void OnNewBeat(int newBeat, double beatLength, TimeSignatures timeSignature, bool kiai)