RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-23 22:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix segment control points not changing in unison

Browse Source
This commit is contained in:
smoogipoo 2018-10-31 18:02:08 +09:00
parent d2fbf05137
commit ffec532079
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/ControlPointPiece.cs
View File

@ -76,46 +76,38 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.SliderMasks.Components
protected override bool OnDrag(DragEvent e) protected override bool OnDrag(DragEvent e)
{ {
var newControlPoints = slider.ControlPoints.ToArray();
if (index == 0) if (index == 0)
{ {
// Special handling for the head - only the position of the slider changes // Special handling for the head - only the position of the slider changes
slider.Position += e.Delta; slider.Position += e.Delta;
// Since control points are relative to the position of the slider, they all need to be offset backwards by the delta // Since control points are relative to the position of the slider, they all need to be offset backwards by the delta
var newControlPoints = slider.ControlPoints.ToArray();
for (int i = 1; i < newControlPoints.Length; i++) for (int i = 1; i < newControlPoints.Length; i++)
newControlPoints[i] -= e.Delta; newControlPoints[i] -= e.Delta;
slider.ControlPoints = newControlPoints;
slider.Curve.Calculate(true);
} }
else else
{
var newControlPoints = slider.ControlPoints.ToArray();
newControlPoints[index] += e.Delta; newControlPoints[index] += e.Delta;
if (isSegmentSeparatorWithNext)
newControlPoints[index + 1] = newControlPoints[index];
if (isSegmentSeparatorWithPrevious)
newControlPoints[index - 1] = newControlPoints[index];
slider.ControlPoints = newControlPoints; slider.ControlPoints = newControlPoints;
slider.Curve.Calculate(true); slider.Curve.Calculate(true);
}
return true; return true;
} }
protected override bool OnDragEnd(DragEndEvent e) => true; protected override bool OnDragEnd(DragEndEvent e) => true;
private bool isSegmentSeparator private bool isSegmentSeparator => isSegmentSeparatorWithNext || isSegmentSeparatorWithPrevious;
{
get
{
bool separator = false;
if (index < slider.ControlPoints.Length - 1) private bool isSegmentSeparatorWithNext => index < slider.ControlPoints.Length - 1 && slider.ControlPoints[index + 1] == slider.ControlPoints[index];
separator |= slider.ControlPoints[index + 1] == slider.ControlPoints[index];
if (index > 0)
separator |= slider.ControlPoints[index - 1] == slider.ControlPoints[index];
return separator; private bool isSegmentSeparatorWithPrevious => index > 0 && slider.ControlPoints[index - 1] == slider.ControlPoints[index];
}
}
} }
} }