h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 02:22:57 +08:00
Code Issues Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
OliBomby 2023-12-20 01:57:11 +01:00
parent 1258a9d378
commit 1365a1b7be
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
View File

@ -353,7 +353,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
{ {
public new SliderBodyPiece BodyPiece => base.BodyPiece; public new SliderBodyPiece BodyPiece => base.BodyPiece;
public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay; public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailPiece; public new TestSliderTailPiece TailPiece => (TestSliderTailPiece)base.TailPiece;
public new PathControlPointVisualiser<Slider> ControlPointVisualiser => base.ControlPointVisualiser; public new PathControlPointVisualiser<Slider> ControlPointVisualiser => base.ControlPointVisualiser;
public TestSliderBlueprint(Slider slider) public TestSliderBlueprint(Slider slider)
@ -362,6 +362,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
} }
protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position); protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
protected override SliderTailPiece CreateTailPiece(Slider slider, SliderPosition position) => new TestSliderTailPiece(slider, position);
} }
private partial class TestSliderCircleOverlay : SliderCircleOverlay private partial class TestSliderCircleOverlay : SliderCircleOverlay
@ -373,5 +374,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
{ {
} }
} }
private partial class TestSliderTailPiece : SliderTailPiece
{
public new HitCirclePiece CirclePiece => base.CirclePiece;
public TestSliderTailPiece(Slider slider, SliderPosition position)
: base(slider, position)
{
}
}
} }
} }

15
osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
() => Precision.AlmostEquals(blueprint.HeadOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre)); () => Precision.AlmostEquals(blueprint.HeadOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
AddAssert("tail positioned correctly", AddAssert("tail positioned correctly",
() => Precision.AlmostEquals(blueprint.TailOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre)); () => Precision.AlmostEquals(blueprint.TailPiece.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
} }
private void moveMouseToControlPoint(int index) private void moveMouseToControlPoint(int index)
@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
{ {
public new SliderBodyPiece BodyPiece => base.BodyPiece; public new SliderBodyPiece BodyPiece => base.BodyPiece;
public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay; public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailPiece; public new TestSliderTailPiece TailPiece => (TestSliderTailPiece)base.TailPiece;
public new PathControlPointVisualiser<Slider> ControlPointVisualiser => base.ControlPointVisualiser; public new PathControlPointVisualiser<Slider> ControlPointVisualiser => base.ControlPointVisualiser;
public TestSliderBlueprint(Slider slider) public TestSliderBlueprint(Slider slider)
@ -207,6 +207,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
} }
protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position); protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
protected override SliderTailPiece CreateTailPiece(Slider slider, SliderPosition position) => new TestSliderTailPiece(slider, position);
} }
private partial class TestSliderCircleOverlay : SliderCircleOverlay private partial class TestSliderCircleOverlay : SliderCircleOverlay
@ -218,5 +219,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
{ {
} }
} }
private partial class TestSliderTailPiece : SliderTailPiece
{
public new HitCirclePiece CirclePiece => base.CirclePiece;
public TestSliderTailPiece(Slider slider, SliderPosition position)
: base(slider, position)
{
}
}
} }
} }

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

@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
{ {
BodyPiece = new SliderBodyPiece(), BodyPiece = new SliderBodyPiece(),
HeadOverlay = CreateCircleOverlay(HitObject, SliderPosition.Start), HeadOverlay = CreateCircleOverlay(HitObject, SliderPosition.Start),
TailPiece = new SliderTailPiece(HitObject, SliderPosition.End), TailPiece = CreateTailPiece(HitObject, SliderPosition.End),
}; };
} }
@ -415,5 +415,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true; BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
protected virtual SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new SliderCircleOverlay(slider, position); protected virtual SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new SliderCircleOverlay(slider, position);
protected virtual SliderTailPiece CreateTailPiece(Slider slider, SliderPosition position) => new SliderTailPiece(slider, position);
} }
} }