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

Merge pull request #7870 from peppy/move-skinnable-test

Browse Source 
Move SkinnableTestScene to main project for consumption by other rulesets
This commit is contained in:
Dan Balasescu
2020-02-18 11:03:12 +09:00
committed by GitHub
Unverified
parent 23faace177 292520c03a
commit b07799ce2f
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+1
View File
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+1
View File
@@ -10,6 +10,7 @@ using osu.Framework.Testing.Input;
using osu.Game.Configuration;
using osu.Game.Rulesets.Osu.UI.Cursor;
using osu.Game.Screens.Play;
using osu.Game.Tests.Visual;
using osuTK;
namespace osu.Game.Rulesets.Osu.Tests
osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+1
View File
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Mods;
using System.Linq;
using NUnit.Framework;
using osu.Game.Rulesets.Scoring;
using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+1
View File
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
{
osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs → osu.Game/Tests/Visual/SkinnableTestScene.cs
+2 -3
View File
@@ -10,9 +10,8 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using osu.Framework.IO.Stores;
using osu.Game.Skinning;
using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Osu.Tests
namespace osu.Game.Tests.Visual
{
public abstract class SkinnableTestScene : OsuGridTestScene
{
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests
[BackgroundDependencyLoader]
private void load(AudioManager audio, SkinManager skinManager)
{
var dllStore = new DllResourceStore(typeof(SkinnableTestScene).Assembly);
var dllStore = new DllResourceStore(GetType().Assembly);
metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);