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

Fix editor summary timeline not responding to kiai changes correctly

Browse Source
This commit is contained in:
Dean Herbert
2022-07-29 18:52:50 +09:00
parent 6703b8df02
commit 8f1e3b0154
1 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs
View File

@ -4,6 +4,7 @@
#nullable disable #nullable disable
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -38,7 +39,35 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
private void load() private void load()
{ {
kiai = effect.KiaiModeBindable.GetBoundCopy(); kiai = effect.KiaiModeBindable.GetBoundCopy();
kiai.BindValueChanged(_ => kiai.BindValueChanged(_ => refreshDisplay(), true);
}
[CanBeNull]
private EffectControlPoint nextControlPoint;
protected override void LoadComplete()
{
base.LoadComplete();
// Due to the limitations of ControlPointInfo, it's impossible to know via event flow when the next kiai point has changed.
// This is due to the fact that an EffectPoint can be added to an existing group. We would need to bind to ItemAdded on *every*
// future group to track this.
//
// I foresee this being a potential performance issue on beatmaps with many control points, so let's limit how often we check
// for changes. ControlPointInfo needs a refactor to make this flow better, but it should do for now.
Scheduler.AddDelayed(() =>
{
var next = beatmap.ControlPointInfo.EffectPoints.FirstOrDefault(c => c.Time > effect.Time);
if (!ReferenceEquals(nextControlPoint, next))
{
nextControlPoint = next;
refreshDisplay();
}
}, 100, true);
}
private void refreshDisplay()
{ {
ClearInternal(); ClearInternal();
@ -47,16 +76,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
if (!kiai.Value) if (!kiai.Value)
return; return;
var endControlPoint = beatmap.ControlPointInfo.EffectPoints.FirstOrDefault(c => c.Time > effect.Time && !c.KiaiMode);
// handle kiai duration // handle kiai duration
// eventually this will be simpler when we have control points with durations. // eventually this will be simpler when we have control points with durations.
if (endControlPoint != null) if (nextControlPoint != null)
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Origin = Anchor.TopLeft; Origin = Anchor.TopLeft;
Width = (float)(endControlPoint.Time - effect.Time); Width = (float)(nextControlPoint.Time - effect.Time);
AddInternal(new PointVisualisation AddInternal(new PointVisualisation
{ {
@ -68,7 +95,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
Colour = effect.GetRepresentingColour(colours).Darken(0.5f), Colour = effect.GetRepresentingColour(colours).Darken(0.5f),
}); });
} }
}, true);
} }
// kiai sections display duration, so are required to be visualised. // kiai sections display duration, so are required to be visualised.