h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 01:00:28 +08:00
Code Issues Releases Wiki Activity

Move setting up the ruleset bindable to top-base test scene

Browse Source
This commit is contained in:
Salman Ahmed
2020-06-10 18:23:31 +03:00
Unverified
parent efd5e14410
commit 4fb71eeb20
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Tests/Visual/EditorTestScene.cs
-1
View File
@@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader]
private void load()
{
Ruleset.Value = CreateEditorRuleset().RulesetInfo;
Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
}
osu.Game/Tests/Visual/OsuTestScene.cs
+1 -1
View File
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader]
private void load(RulesetStore rulesets)
{
Ruleset.Value = rulesets.AvailableRulesets.First();
Ruleset.Value = CreateRuleset()?.RulesetInfo ?? rulesets.AvailableRulesets.First();
}
protected override void Dispose(bool isDisposing)
osu.Game/Tests/Visual/PlayerTestScene.cs
+2 -12
View File
@@ -24,20 +24,9 @@ namespace osu.Game.Tests.Visual
protected OsuConfigManager LocalConfig;
private readonly Ruleset ruleset;
protected PlayerTestScene()
{
ruleset = CreatePlayerRuleset();
}
[BackgroundDependencyLoader]
private void load()
{
// There are test scenes using current value of the ruleset bindable
// on their BDLs (example in TestSceneSliderSnaking's BDL)
Ruleset.Value = ruleset.RulesetInfo;
Dependencies.Cache(LocalConfig = new OsuConfigManager(LocalStorage));
LocalConfig.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
}
@@ -58,7 +47,7 @@ namespace osu.Game.Tests.Visual
action?.Invoke();
AddStep(ruleset.Description, LoadPlayer);
AddStep(CreatePlayerRuleset().Description, LoadPlayer);
AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
}
@@ -68,6 +57,7 @@ namespace osu.Game.Tests.Visual
protected void LoadPlayer()
{
var ruleset = Ruleset.Value.CreateInstance();
var beatmap = CreateBeatmap(ruleset.RulesetInfo);
Beatmap.Value = CreateWorkingBeatmap(beatmap);
osu.Game/Tests/Visual/SkinnableTestScene.cs
+1 -6
View File
@@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual
{
public abstract class SkinnableTestScene : OsuGridTestScene
{
private readonly Ruleset ruleset;
private Skin metricsSkin;
private Skin defaultSkin;
private Skin specialSkin;
@@ -33,14 +31,11 @@ namespace osu.Game.Tests.Visual
protected SkinnableTestScene()
: base(2, 3)
{
ruleset = CreateRulesetForSkinProvider();
}
[BackgroundDependencyLoader]
private void load(AudioManager audio, SkinManager skinManager)
{
Ruleset.Value = ruleset.RulesetInfo;
var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
@@ -110,7 +105,7 @@ namespace osu.Game.Tests.Visual
{
new OutlineBox { Alpha = autoSize ? 1 : 0 },
mainProvider.WithChild(
new SkinProvidingContainer(ruleset.CreateLegacySkinProvider(mainProvider, beatmap))
new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider, beatmap))
{
Child = created,
RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,