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

Use common body piece

Browse Source
This commit is contained in:
smoogipoo 2018-10-25 19:38:00 +09:00
parent e964a555d0
commit 4fa511043e
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Rulesets.Osu/Edit/Masks/Slider/SliderPlacementMask.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Lines;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
@ -23,7 +22,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{ {
public new Objects.Slider HitObject => (Objects.Slider)base.HitObject; public new Objects.Slider HitObject => (Objects.Slider)base.HitObject;
private Path path;
private Container<SliderControlPoint> controlPointContainer; private Container<SliderControlPoint> controlPointContainer;
private readonly List<Segment> segments = new List<Segment>(); private readonly List<Segment> segments = new List<Segment>();
@ -43,14 +41,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
path = new SmoothPath { PathWidth = 3 }, new BodyPiece(HitObject),
new SliderCirclePiece(HitObject, SliderPosition.Start), new SliderCirclePiece(HitObject, SliderPosition.Start),
new SliderCirclePiece(HitObject, SliderPosition.End), new SliderCirclePiece(HitObject, SliderPosition.End),
controlPointContainer = new Container<SliderControlPoint> { RelativeSizeAxes = Axes.Both } controlPointContainer = new Container<SliderControlPoint> { RelativeSizeAxes = Axes.Both }
}; };
path.Colour = colours.YellowDark;
setState(PlacementState.Initial); setState(PlacementState.Initial);
} }
@ -128,23 +124,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.Slider
{ {
base.Update(); base.Update();
segments.ForEach(s => s.Calculate());
switch (state)
{
case PlacementState.Body:
path.Position = HitObject.Position;
path.ClearVertices();
for (int i = 0; i < segments.Count; i++) for (int i = 0; i < segments.Count; i++)
{ segments[i].Calculate(i == segments.Count - 1 ? (Vector2?)cursor : null);
var segmentPath = segments[i].Calculate(i == segments.Count - 1 ? (Vector2?)cursor : null);
segmentPath.ForEach(v => path.AddVertex(v));
}
path.OriginPosition = path.PositionInBoundingBox(Vector2.Zero); HitObject.ControlPoints = segments.SelectMany(s => s.ControlPoints).Concat(cursor.Yield()).ToList();
break; HitObject.CurveType = HitObject.ControlPoints.Count > 2 ? CurveType.Bezier : CurveType.Linear;
} HitObject.Distance = segments.Sum(s => s.Distance);
} }
private void setState(PlacementState newState) private void setState(PlacementState newState)