h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 22:07:25 +08:00
Code Issues Releases Wiki Activity

Apply suggestions and remove redundant updateConnectingPath call

Browse Source
This commit is contained in:
kamp 2020-11-17 22:23:46 +01:00
parent c6618f08aa
commit c8fb49d540
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointConnectionPiece.cs
View File

@ -20,17 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
private readonly Path path; private readonly Path path;
private readonly Slider slider; private readonly Slider slider;
private int controlPointIndex; public int ControlPointIndex { get; set; }
public int ControlPointIndex
{
get => controlPointIndex;
set
{
controlPointIndex = value;
updateConnectingPath();
}
}
private IBindable<Vector2> sliderPosition; private IBindable<Vector2> sliderPosition;
private IBindable<int> pathVersion; private IBindable<int> pathVersion;
@ -38,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
public PathControlPointConnectionPiece(Slider slider, int controlPointIndex) public PathControlPointConnectionPiece(Slider slider, int controlPointIndex)
{ {
this.slider = slider; this.slider = slider;
this.controlPointIndex = controlPointIndex; ControlPointIndex = controlPointIndex;
Origin = Anchor.Centre; Origin = Anchor.Centre;
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
@ -74,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
path.ClearVertices(); path.ClearVertices();
int nextIndex = controlPointIndex + 1; int nextIndex = ControlPointIndex + 1;
if (nextIndex == 0 || nextIndex >= slider.Path.ControlPoints.Count) if (nextIndex == 0 || nextIndex >= slider.Path.ControlPoints.Count)
return; return;

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

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
switch (e.Action) switch (e.Action)
{ {
case NotifyCollectionChangedAction.Add: case NotifyCollectionChangedAction.Add:
// If inserting in the the path (not appending), // If inserting in the path (not appending),
// update indices of existing connections after insert location // update indices of existing connections after insert location
if (e.NewStartingIndex < Pieces.Count) if (e.NewStartingIndex < Pieces.Count)
{ {
@ -93,8 +93,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
break; break;
case NotifyCollectionChangedAction.Remove: case NotifyCollectionChangedAction.Remove:
int oldSize = Pieces.Count;
foreach (var point in e.OldItems.Cast<PathControlPoint>()) foreach (var point in e.OldItems.Cast<PathControlPoint>())
{ {
Pieces.RemoveAll(p => p.ControlPoint == point); Pieces.RemoveAll(p => p.ControlPoint == point);
@ -103,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
// If removing before the end of the path, // If removing before the end of the path,
// update indices of connections after remove location // update indices of connections after remove location
if (e.OldStartingIndex + e.OldItems.Count < oldSize) if (e.OldStartingIndex + e.OldItems.Count < Pieces.Count + e.OldItems.Count)
{ {
foreach (var connection in Connections) foreach (var connection in Connections)
{ {