sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify linq tracking logic

Browse Source
This commit is contained in:
Dean Herbert
2022-06-01 17:57:53 +09:00
parent 655780fd98
commit 187acb0718
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -156,35 +156,11 @@ namespace osu.Game.Screens.Edit.Timing
{ {
// We don't have an efficient way of looking up groups currently, only individual point types. // We don't have an efficient way of looking up groups currently, only individual point types.
// To improve the efficiency of this in the future, we should reconsider the overall structure of ControlPointInfo. // To improve the efficiency of this in the future, we should reconsider the overall structure of ControlPointInfo.
IEnumerable<ControlPointGroup> groups = Beatmap.ControlPointInfo.Groups;
bool currentTimeBeforeSelectedGroup = clock.CurrentTimeAccurate < selectedGroup.Value.Time;
// Decide whether we are searching backwards or forwards.
if (currentTimeBeforeSelectedGroup)
groups = groups.Reverse();
// Find the next group which has the same type as the selected one. // Find the next group which has the same type as the selected one.
groups = groups.SkipWhile(g => g != selectedGroup.Value) selectedGroup.Value = Beatmap.ControlPointInfo.Groups
.Skip(1) .Where(g => g.ControlPoints.Any(cp => cp.GetType() == selectedPointType))
.Where(g => g.ControlPoints.Any(cp => cp.GetType() == selectedPointType)); .LastOrDefault(g => g.Time <= clock.CurrentTimeAccurate);
ControlPointGroup newGroup = groups.FirstOrDefault();
if (newGroup != null)
{
if (currentTimeBeforeSelectedGroup)
{
// When seeking backwards, the first match from the LINQ query is always what we want.
selectedGroup.Value = newGroup;
}
else
{
// When seeking forwards, we also need to check that the next match is before the current time.
if (newGroup.Time <= clock.CurrentTimeAccurate)
selectedGroup.Value = newGroup;
}
}
} }
} }