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

General cleanups

Browse Source
This commit is contained in:
smoogipoo 2019-12-09 16:44:19 +09:00
parent c18f2e6436
commit 53f7c753fb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
private bool deleteSelected() private bool deleteSelected()
{ {
List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => p.Index).Select(i => slider.Path.ControlPoints[i]).ToList(); List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => slider.Path.ControlPoints[p.Index]).ToList();
// Ensure that there are any points to be deleted // Ensure that there are any points to be deleted
if (toRemove.Count == 0) if (toRemove.Count == 0)

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

@ -41,7 +41,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
segmentStart = HitObject.Path.ControlPoints[0]; segmentStart = HitObject.Path.ControlPoints[0];
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -150,9 +149,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
case 2: case 2:
segmentStart.Type.Value = PathType.Linear; segmentStart.Type.Value = PathType.Linear;
break; break;
case 3: case 3:
segmentStart.Type.Value = PathType.PerfectCurve; segmentStart.Type.Value = PathType.PerfectCurve;
break; break;
default: default:
segmentStart.Type.Value = PathType.Bezier; segmentStart.Type.Value = PathType.Bezier;
break; break;

2
osu.Game.Tests/Visual/Gameplay/TestSceneSliderPath.cs
View File

@ -6,7 +6,6 @@ using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Lines; using osu.Framework.Graphics.Lines;
using osu.Framework.MathUtils;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osuTK; using osuTK;
@ -141,6 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
case 2: case 2:
path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100))); path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100)));
break; break;
case 4: case 4:
path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0))); path.ControlPoints.AddRange(createSegment(PathType.PerfectCurve, Vector2.Zero, new Vector2(0, 100), new Vector2(100), new Vector2(100, 0)));
break; break;