h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:42:56 +08:00
Code Issues Releases Wiki Activity

Revert a bit of BeatSyncedContainer for smaller changeset.

Browse Source
This commit is contained in:
smoogipooo 2017-05-23 16:05:58 +09:00
parent 836bf930a0
commit 1867cbb381
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 773d60eb6b811f395e32a22dc66bb4d2e63a6dbc
Subproject commit c6f030d6f1ab65a48de9ff1d0c424acb686e0149

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

@ -2,11 +2,11 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Configuration;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Beatmaps.Timing;
namespace osu.Game.Graphics.Containers
{
@ -16,7 +16,6 @@ namespace osu.Game.Graphics.Containers
private int lastBeat;
private TimingControlPoint lastTimingPoint;
private EffectControlPoint lastEffectPoint;
protected override void Update()
{
@ -31,21 +30,21 @@ namespace osu.Game.Graphics.Containers
if (timingPoint.BeatLength == 0)
return;
int beatIndex = (int)((currentTrackTime - timingPoint.Time) / timingPoint.BeatLength);
int beat = (int)((currentTrackTime - timingPoint.Time) / timingPoint.BeatLength);
// The beats before the start of the first control point are off by 1, this should do the trick
if (currentTrackTime < timingPoint.Time)
beatIndex--;
beat--;
if (timingPoint == lastTimingPoint && beatIndex == lastBeat)
if (timingPoint == lastTimingPoint && beat == lastBeat)
return;
double offsetFromBeat = (timingPoint.Time - currentTrackTime) % timingPoint.BeatLength;
using (BeginDelayedSequence(offsetFromBeat, true))
OnNewBeat(beatIndex, timingPoint, effectPoint, beatmap.Value.Track.CurrentAmplitudes);
OnNewBeat(beat, timingPoint.BeatLength, timingPoint.TimeSignature, effectPoint.KiaiMode);
lastBeat = beatIndex;
lastBeat = beat;
lastTimingPoint = timingPoint;
}
@ -55,7 +54,7 @@ namespace osu.Game.Graphics.Containers
beatmap.BindTo(game.Beatmap);
}
protected virtual void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
protected virtual void OnNewBeat(int newBeat, double beatLength, TimeSignatures timeSignature, bool kiai)
{
}
}