mirror of
https://github.com/ppy/osu.git
synced 2024-11-16 10:57:26 +08:00
bdeea37a44
This was reported in https://github.com/ppy/osu/pull/28474, albeit the
code changes proposed there did not fix the issue at all.
See 8b6385f7d0
for demonstration of the
crash scenario. Basically what is happening there is:
- The starting premise is that there is a spinner placement active.
- At this time, a drag selection is started via the timeline.
- Once the drag selection finds at least one suitable object to select,
it mutates `SelectedItems`.
- When selection changes for any reason, the `HitObjectComposer`
decides to switch to the "select" tool, regardless of why
the selection changed.
- Changing the active tool causes the current placement - if any -
to be committed, which mutates the beatmap.
- Back at the drag box selection code, this causes a "collection
modified when enumerating" exception.
The proposed fix here is to eagerly commit active placement - if any -
when drag selection is initiated via the timeline, which avoids this
issue. This also appears to vaguely match stable behaviour and is sort
of consistent with the logic of committing any outstanding changes upon
switching to the selection tool.
267 lines
9.6 KiB
C#
267 lines
9.6 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
#nullable disable
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Extensions.Color4Extensions;
|
|
using osu.Framework.Extensions.ObjectExtensions;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Colour;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.Shapes;
|
|
using osu.Framework.Input.Events;
|
|
using osu.Framework.Utils;
|
|
using osu.Game.Graphics;
|
|
using osu.Game.Rulesets.Edit;
|
|
using osu.Game.Rulesets.Objects;
|
|
using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
|
|
using osuTK;
|
|
using osuTK.Graphics;
|
|
|
|
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
|
|
{
|
|
internal partial class TimelineBlueprintContainer : EditorBlueprintContainer
|
|
{
|
|
[Resolved(CanBeNull = true)]
|
|
private Timeline timeline { get; set; }
|
|
|
|
private Bindable<HitObject> placement;
|
|
private SelectionBlueprint<HitObject> placementBlueprint;
|
|
|
|
private bool hitObjectDragged;
|
|
|
|
/// <remarks>
|
|
/// Positional input must be received outside the container's bounds,
|
|
/// in order to handle timeline blueprints which are stacked offscreen.
|
|
/// </remarks>
|
|
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => timeline.ReceivePositionalInputAt(screenSpacePos);
|
|
|
|
public TimelineBlueprintContainer(HitObjectComposer composer)
|
|
: base(composer)
|
|
{
|
|
RelativeSizeAxes = Axes.Both;
|
|
Anchor = Anchor.Centre;
|
|
Origin = Anchor.Centre;
|
|
|
|
Height = 0.6f;
|
|
}
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
AddInternal(new SelectableAreaBackground
|
|
{
|
|
Colour = Color4.Black,
|
|
Depth = float.MaxValue,
|
|
Blending = BlendingParameters.Additive,
|
|
});
|
|
}
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
|
|
placement = Beatmap.PlacementObject.GetBoundCopy();
|
|
placement.ValueChanged += placementChanged;
|
|
}
|
|
|
|
private void placementChanged(ValueChangedEvent<HitObject> obj)
|
|
{
|
|
if (obj.NewValue == null)
|
|
{
|
|
if (placementBlueprint != null)
|
|
{
|
|
SelectionBlueprints.Remove(placementBlueprint, true);
|
|
placementBlueprint = null;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
placementBlueprint = CreateBlueprintFor(obj.NewValue).AsNonNull();
|
|
|
|
placementBlueprint.Colour = OsuColour.Gray(0.9f);
|
|
|
|
// TODO: this is out of order, causing incorrect stacking height.
|
|
SelectionBlueprints.Add(placementBlueprint);
|
|
}
|
|
}
|
|
|
|
protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
|
|
|
|
protected override bool OnDragStart(DragStartEvent e)
|
|
{
|
|
if (!base.ReceivePositionalInputAt(e.ScreenSpaceMouseDownPosition))
|
|
return false;
|
|
|
|
return base.OnDragStart(e);
|
|
}
|
|
|
|
protected override void Update()
|
|
{
|
|
if (IsDragged || hitObjectDragged)
|
|
handleScrollViaDrag();
|
|
|
|
if (Composer != null && timeline != null)
|
|
{
|
|
Composer.Playfield.PastLifetimeExtension = timeline.VisibleRange / 2;
|
|
Composer.Playfield.FutureLifetimeExtension = timeline.VisibleRange / 2;
|
|
}
|
|
|
|
base.Update();
|
|
|
|
updateStacking();
|
|
}
|
|
|
|
private readonly Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
|
|
|
|
private void updateStacking()
|
|
{
|
|
// because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
|
|
|
|
const int stack_offset = 5;
|
|
|
|
// after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
|
|
const int stack_reset_count = 3;
|
|
|
|
currentConcurrentObjects.Clear();
|
|
|
|
for (int i = SelectionBlueprints.Count - 1; i >= 0; i--)
|
|
{
|
|
var b = SelectionBlueprints[i];
|
|
|
|
// remove objects from the stack as long as their end time is in the past.
|
|
while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
|
|
{
|
|
if (Precision.AlmostBigger(hitObject.GetEndTime(), b.Item.StartTime, 1))
|
|
break;
|
|
|
|
currentConcurrentObjects.Pop();
|
|
}
|
|
|
|
// if the stack gets too high, we should have space below it to display the next batch of objects.
|
|
// importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
|
|
if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.Item.StartTime, 1))
|
|
{
|
|
if (currentConcurrentObjects.Count >= stack_reset_count)
|
|
currentConcurrentObjects.Clear();
|
|
}
|
|
|
|
b.Y = -(stack_offset * currentConcurrentObjects.Count);
|
|
|
|
currentConcurrentObjects.Push(b.Item);
|
|
}
|
|
}
|
|
|
|
protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
|
|
|
|
protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
|
|
{
|
|
return new TimelineHitObjectBlueprint(item)
|
|
{
|
|
OnDragHandled = e => hitObjectDragged = e != null,
|
|
};
|
|
}
|
|
|
|
protected sealed override DragBox CreateDragBox() => new TimelineDragBox();
|
|
|
|
protected override void UpdateSelectionFromDragBox()
|
|
{
|
|
Composer.BlueprintContainer.CommitIfPlacementActive();
|
|
|
|
var dragBox = (TimelineDragBox)DragBox;
|
|
double minTime = dragBox.MinTime;
|
|
double maxTime = dragBox.MaxTime;
|
|
|
|
SelectedItems.RemoveAll(hitObject => !shouldBeSelected(hitObject));
|
|
|
|
foreach (var hitObject in Beatmap.HitObjects.Except(SelectedItems).Where(shouldBeSelected))
|
|
{
|
|
Composer.Playfield.SetKeepAlive(hitObject, true);
|
|
SelectedItems.Add(hitObject);
|
|
}
|
|
|
|
bool shouldBeSelected(HitObject hitObject)
|
|
{
|
|
double midTime = (hitObject.StartTime + hitObject.GetEndTime()) / 2;
|
|
return minTime <= midTime && midTime <= maxTime;
|
|
}
|
|
}
|
|
|
|
private void handleScrollViaDrag()
|
|
{
|
|
if (timeline == null) return;
|
|
|
|
var timelineQuad = timeline.ScreenSpaceDrawQuad;
|
|
float mouseX = InputManager.CurrentState.Mouse.Position.X;
|
|
|
|
// scroll if in a drag and dragging outside visible extents
|
|
if (mouseX > timelineQuad.TopRight.X)
|
|
timeline.ScrollBy((float)((mouseX - timelineQuad.TopRight.X) / 10 * Clock.ElapsedFrameTime));
|
|
else if (mouseX < timelineQuad.TopLeft.X)
|
|
timeline.ScrollBy((float)((mouseX - timelineQuad.TopLeft.X) / 10 * Clock.ElapsedFrameTime));
|
|
}
|
|
|
|
private partial class SelectableAreaBackground : CompositeDrawable
|
|
{
|
|
[Resolved]
|
|
private OsuColour colours { get; set; }
|
|
|
|
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
|
|
{
|
|
float localY = ToLocalSpace(screenSpacePos).Y;
|
|
return DrawRectangle.Top <= localY && DrawRectangle.Bottom >= localY;
|
|
}
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
RelativeSizeAxes = Axes.Both;
|
|
Alpha = 0.1f;
|
|
|
|
AddRangeInternal(new[]
|
|
{
|
|
// fade out over intro time, outside the valid time bounds.
|
|
new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Y,
|
|
Width = 200,
|
|
Origin = Anchor.TopRight,
|
|
Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White),
|
|
},
|
|
new Box
|
|
{
|
|
Colour = Color4.White,
|
|
RelativeSizeAxes = Axes.Both,
|
|
}
|
|
});
|
|
}
|
|
|
|
protected override bool OnHover(HoverEvent e)
|
|
{
|
|
this.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
|
|
return base.OnHover(e);
|
|
}
|
|
|
|
protected override void OnHoverLost(HoverLostEvent e)
|
|
{
|
|
this.FadeColour(Color4.Black, 600, Easing.OutQuint);
|
|
base.OnHoverLost(e);
|
|
}
|
|
}
|
|
|
|
protected partial class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint<HitObject>>
|
|
{
|
|
protected override Container<SelectionBlueprint<HitObject>> Content { get; }
|
|
|
|
public TimelineSelectionBlueprintContainer()
|
|
{
|
|
AddInternal(new TimelinePart<SelectionBlueprint<HitObject>>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
|
|
}
|
|
}
|
|
}
|
|
}
|