h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:57:52 +08:00
Code Issues Releases Wiki Activity

Merge pull request #27556 from EVAST9919/editor-timing-alloc

Browse Source 
Reduce allocations in editor timing screen
This commit is contained in:
Dean Herbert 2024-03-10 09:43:02 +08:00 committed by GitHub
commit 1ae8d341cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Screens/Edit/Timing/ControlPointList.cs
View File

@ -162,26 +162,43 @@ namespace osu.Game.Screens.Edit.Timing
// If the selected group only has one control point, update the tracking type. // If the selected group only has one control point, update the tracking type.
case 1: case 1:
trackedType = selectedGroup.Value?.ControlPoints.Single().GetType(); trackedType = selectedGroup.Value?.ControlPoints[0].GetType();
break; break;
// If the selected group has more than one control point, choose the first as the tracking type // If the selected group has more than one control point, choose the first as the tracking type
// if we don't already have a singular tracked type. // if we don't already have a singular tracked type.
default: default:
trackedType ??= selectedGroup.Value?.ControlPoints.FirstOrDefault()?.GetType(); trackedType ??= selectedGroup.Value?.ControlPoints[0].GetType();
break; break;
} }
} }
if (trackedType != null) if (trackedType != null)
{ {
double accurateTime = clock.CurrentTimeAccurate;
// 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.
// 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.
var found = Beatmap.ControlPointInfo.Groups ControlPointGroup? found = null;
.Where(g => g.ControlPoints.Any(cp => cp.GetType() == trackedType))
.LastOrDefault(g => g.Time <= clock.CurrentTimeAccurate); for (int i = 0; i < Beatmap.ControlPointInfo.Groups.Count; i++)
{
var g = Beatmap.ControlPointInfo.Groups[i];
if (g.Time > accurateTime)
continue;
for (int j = 0; j < g.ControlPoints.Count; j++)
{
if (g.ControlPoints[j].GetType() == trackedType)
{
found = g;
break;
}
}
}
if (found != null) if (found != null)
selectedGroup.Value = found; selectedGroup.Value = found;