sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add scaling path type recovery

Browse Source
This commit is contained in:
Naxess
2021-03-29 15:49:49 +02:00
parent 51f0477df4
commit 70d5b616f2
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -33,6 +33,7 @@ namespace osu.Game.Rulesets.Osu.Edit
{ {
base.OnOperationEnded(); base.OnOperationEnded();
referenceOrigin = null; referenceOrigin = null;
referencePathTypes = null;
} }
public override bool HandleMovement(MoveSelectionEvent moveEvent) => public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
@ -43,6 +44,12 @@ namespace osu.Game.Rulesets.Osu.Edit
/// </summary> /// </summary>
private Vector2? referenceOrigin; private Vector2? referenceOrigin;
/// <summary>
/// During a transform, the initial path types of a single selected slider are stored so they
/// can be maintained throughout the operation.
/// </summary>
private List<PathType?> referencePathTypes;
public override bool HandleReverse() public override bool HandleReverse()
{ {
var hitObjects = EditorBeatmap.SelectedHitObjects; var hitObjects = EditorBeatmap.SelectedHitObjects;
@ -141,11 +148,17 @@ namespace osu.Game.Rulesets.Osu.Edit
// is not looking to change the duration of the slider but expand the whole pattern. // is not looking to change the duration of the slider but expand the whole pattern.
if (hitObjects.Length == 1 && hitObjects.First() is Slider slider) if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
{ {
referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type.Value).ToList();
Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value)); Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height); Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
foreach (var point in slider.Path.ControlPoints) foreach (var point in slider.Path.ControlPoints)
point.Position.Value *= pathRelativeDeltaScale; point.Position.Value *= pathRelativeDeltaScale;
// Maintain the path types in case they were defaulted to bezier at some point during scaling
for (int i = 0; i < slider.Path.ControlPoints.Count; ++i)
slider.Path.ControlPoints[i].Type.Value = referencePathTypes[i];
} }
else else
{ {