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

Keep distance spacing reset to one on test scenes with slider snapping for now

Browse Source
This commit is contained in:
Salman Ahmed
2022-04-28 06:44:02 +03:00
parent bfc6bfc91b
commit a5defbe496
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Osu.Tests/Editor/TestSceneObjectObjectSnap.cs
View File

@ -3,11 +3,9 @@
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Bindables;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.UI; using osu.Game.Rulesets.Osu.UI;
using osu.Game.Tests.Beatmaps; using osu.Game.Tests.Beatmaps;
@ -21,18 +19,16 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
{ {
private OsuPlayfield playfield; private OsuPlayfield playfield;
protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false); protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false)
{
BeatmapInfo = { DistanceSpacing = 1 }
};
public override void SetUpSteps() public override void SetUpSteps()
{ {
base.SetUpSteps(); base.SetUpSteps();
AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First()); AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
AddStep("seek to first control point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time)); AddStep("seek to first control point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
AddStep("set distance spacing to 1", () =>
{
var distanceSpacing = (BindableDouble)Editor.ChildrenOfType<IDistanceSnapProvider>().Single().DistanceSpacingMultiplier;
distanceSpacing.Value = 1;
});
} }
[TestCase(true)] [TestCase(true)]

10
osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSnapping.cs
View File

@ -4,14 +4,12 @@
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Edit; using osu.Game.Rulesets.Osu.Edit;
using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components; using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
@ -38,7 +36,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
controlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length }); controlPointInfo.Add(0, new TimingControlPoint { BeatLength = beat_length });
return new TestBeatmap(ruleset, false) return new TestBeatmap(ruleset, false)
{ {
ControlPointInfo = controlPointInfo ControlPointInfo = controlPointInfo,
BeatmapInfo = { DistanceSpacing = 1 },
}; };
} }
@ -67,11 +66,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
var beatDivisor = Editor.Dependencies.Get<BindableBeatDivisor>(); var beatDivisor = Editor.Dependencies.Get<BindableBeatDivisor>();
beatDivisor.Value = 1; beatDivisor.Value = 1;
}); });
AddStep("set distance spacing to 1", () =>
{
var distanceSpacing = (BindableDouble)Editor.ChildrenOfType<IDistanceSnapProvider>().Single().DistanceSpacingMultiplier;
distanceSpacing.Value = 1;
});
} }
[Test] [Test]