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

Simplify drag handling code in SliderPlacementBlueprint

Browse Source
This commit is contained in:
Dean Herbert 2023-11-21 14:51:09 +09:00
parent cf6f66b84f
commit 016de7be6a
No known key found for this signature in database
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
View File

@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
controlPointVisualiser = new PathControlPointVisualiser<Slider>(HitObject, false)
};
setState(SliderPlacementState.Initial);
state = SliderPlacementState.Initial;
}
protected override void LoadComplete()
@ -164,38 +164,30 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
protected override bool OnDragStart(DragStartEvent e)
{
if (e.Button == MouseButton.Left)
{
switch (state)
{
case SliderPlacementState.Initial:
return true;
if (e.Button != MouseButton.Left)
return base.OnDragStart(e);
case SliderPlacementState.ControlPoints:
if (HitObject.Path.ControlPoints.Count < 3)
{
var lastCp = HitObject.Path.ControlPoints.LastOrDefault();
if (lastCp != cursor && HitObject.Path.ControlPoints.Count == 2)
return false;
if (state != SliderPlacementState.ControlPoints)
return base.OnDragStart(e);
bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
setState(SliderPlacementState.Drawing);
return true;
}
// Only enter drawing mode if no additional control points have been placed.
if (HitObject.Path.ControlPoints.Count > 2)
return base.OnDragStart(e);
return false;
}
}
return base.OnDragStart(e);
bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMouseDownPosition) - HitObject.Position);
state = SliderPlacementState.Drawing;
return true;
}
protected override void OnDrag(DragEvent e)
{
base.OnDrag(e);
bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
if (state == SliderPlacementState.Drawing)
{
bSplineBuilder.AddLinearPoint(ToLocalSpace(e.ScreenSpaceMousePosition) - HitObject.Position);
Scheduler.AddOnce(updateSliderPathFromBSplineBuilder);
}
}
private void updateSliderPathFromBSplineBuilder()
@ -260,7 +252,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
private void beginCurve()
{
BeginPlacement(commitStart: true);
setState(SliderPlacementState.ControlPoints);
state = SliderPlacementState.ControlPoints;
}
private void endCurve()
@ -357,11 +349,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
tailCirclePiece.UpdateFrom(HitObject.TailCircle);
}
private void setState(SliderPlacementState newState)
{
state = newState;
}
private enum SliderPlacementState
{
Initial,