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

Update stuff to command proxies

Browse Source
This commit is contained in:
Marvin Schürz 2024-10-11 01:53:35 +02:00
parent 0e9bafdbe5
commit 76dd26dd87
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
View File

@ -26,7 +26,6 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Commands;
using osu.Game.Screens.Edit.Commands.Proxies;
using osuTK;
using osuTK.Input;
@ -44,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
private readonly T hitObject;
private readonly bool allowSelection;
private CommandProxy<T> proxy;
private CommandProxy<T> proxy => hitObject.AsCommandProxy(commandHandler);
private InputManager inputManager;
@ -79,8 +78,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
controlPoints.CollectionChanged += onControlPointsChanged;
controlPoints.BindTo(hitObject.Path.ControlPoints);
proxy = new CommandProxy<T>(commandHandler, hitObject);
}
// Generally all the control points are within the visible area all the time.
@ -119,7 +116,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
return;
if (segment.Count > 3)
commandHandler.SafeSubmit(new SetPathTypeCommand(first, PathType.BEZIER));
first.AsCommandProxy(commandHandler).SetType(PathType.BEZIER);
if (segment.Count != 3)
return;
@ -127,7 +124,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
ReadOnlySpan<Vector2> points = segment.Select(p => p.Position).ToArray();
RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
commandHandler.SafeSubmit(new SetPathTypeCommand(first, PathType.BEZIER));
first.AsCommandProxy(commandHandler).SetType(PathType.BEZIER);
}
/// <summary>
@ -357,7 +354,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
foreach (var p in Pieces.Where(p => p.IsSelected.Value))
{
List<PathControlPoint> pointsInSegment = hitObject.Path.PointsInSegment(p.ControlPoint);
var pointsInSegment = hitObject.Path.PointsInSegment(p.ControlPoint).AsListCommandProxy(commandHandler);
int indexInSegment = pointsInSegment.IndexOf(p.ControlPoint);
if (type?.Type == SplineType.PerfectCurve)
@ -368,19 +365,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
int thirdPointIndex = indexInSegment + 2;
if (pointsInSegment.Count > thirdPointIndex + 1)
pointsInSegment[thirdPointIndex].Type = pointsInSegment[0].Type;
pointsInSegment[thirdPointIndex].SetType(pointsInSegment[0].Type());
}
hitObject.Path.ExpectedDistance.Value = null;
p.ControlPoint.Type = type;
proxy.Path().SetExpectedDistance(null);
p.ControlPoint.AsCommandProxy(commandHandler).SetType(type);
}
EnsureValidPathTypes();
if (hitObject.Path.Distance < originalDistance)
hitObject.SnapTo(distanceSnapProvider);
proxy.SnapTo(distanceSnapProvider);
else
hitObject.Path.ExpectedDistance.Value = originalDistance;
proxy.Path().SetExpectedDistance(originalDistance);
commandHandler?.Commit();
}

7
osu.Game/Screens/Edit/Commands/Proxies/ListCommandProxy.cs
View File

@ -61,10 +61,9 @@ namespace osu.Game.Screens.Edit.Commands.Proxies
public bool IsReadOnly => Target.IsReadOnly;
public int IndexOf(TItemProxy item)
{
return Target.IndexOf(item.Target);
}
public int IndexOf(TItemProxy item) => IndexOf(item.Target);
public int IndexOf(TItem item) => Target.IndexOf(item);
public void Insert(int index, TItemProxy item) => Insert(index, item.Target);