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

Apply more renames

Browse Source
This commit is contained in:
Dean Herbert 2022-09-18 18:18:10 +09:00
parent 41e69fbca6
commit d0b8409de5
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(SkinManager skins) private void load(SkinManager skins)
{ {
var defaultLegacySkin = skins.DefaultLegacySkin; var defaultLegacySkin = skins.DefaultClassicSkin;
// sprite names intentionally swapped to match stable member naming / ease of cross-referencing // sprite names intentionally swapped to match stable member naming / ease of cross-referencing
explosion1.Texture = defaultLegacySkin.GetTexture("scoreboard-explosion-2"); explosion1.Texture = defaultLegacySkin.GetTexture("scoreboard-explosion-2");

2
osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs
View File

@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Tests
}); });
AddStep("setup default legacy skin", () => AddStep("setup default legacy skin", () =>
{ {
skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo; skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
}); });
}); });
} }

2
osu.Game.Tests/Skins/IO/ImportSkinTest.cs
View File

@ -226,7 +226,7 @@ namespace osu.Game.Tests.Skins.IO
{ {
var skinManager = osu.Dependencies.Get<SkinManager>(); var skinManager = osu.Dependencies.Get<SkinManager>();
skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo; skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
skinManager.EnsureMutableSkin(); skinManager.EnsureMutableSkin();

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

@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
} }
private TestParticleSpewer createSpewer() => private TestParticleSpewer createSpewer() =>
new TestParticleSpewer(skinManager.DefaultLegacySkin.GetTexture("star2")) new TestParticleSpewer(skinManager.DefaultClassicSkin.GetTexture("star2"))
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,

14
osu.Game/Skinning/SkinManager.cs
View File

@ -59,14 +59,14 @@ namespace osu.Game.Skinning
private readonly IResourceStore<byte[]> userFiles; private readonly IResourceStore<byte[]> userFiles;
/// <summary> /// <summary>
/// The default skin. /// The default "triangles" skin.
/// </summary> /// </summary>
public Skin DefaultSkinTriangles { get; } public Skin DefaultSkinTriangles { get; }
/// <summary> /// <summary>
/// The default legacy skin. /// The default "classic" skin.
/// </summary> /// </summary>
public Skin DefaultLegacySkin { get; } public Skin DefaultClassicSkin { get; }
public SkinManager(Storage storage, RealmAccess realm, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler) public SkinManager(Storage storage, RealmAccess realm, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler)
: base(storage, realm) : base(storage, realm)
@ -85,7 +85,7 @@ namespace osu.Game.Skinning
var defaultSkins = new[] var defaultSkins = new[]
{ {
DefaultLegacySkin = new DefaultLegacySkin(this), DefaultClassicSkin = new DefaultLegacySkin(this),
DefaultSkinTriangles = new TrianglesSkin(this), DefaultSkinTriangles = new TrianglesSkin(this),
}; };
@ -229,8 +229,8 @@ namespace osu.Game.Skinning
{ {
yield return CurrentSkin.Value; yield return CurrentSkin.Value;
if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultLegacySkin) if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultClassicSkin)
yield return DefaultLegacySkin; yield return DefaultClassicSkin;
if (CurrentSkin.Value != DefaultSkinTriangles) if (CurrentSkin.Value != DefaultSkinTriangles)
yield return DefaultSkinTriangles; yield return DefaultSkinTriangles;
@ -310,7 +310,7 @@ namespace osu.Game.Skinning
if (skinInfo == null) if (skinInfo == null)
{ {
if (guid == SkinInfo.CLASSIC_SKIN) if (guid == SkinInfo.CLASSIC_SKIN)
skinInfo = DefaultLegacySkin.SkinInfo; skinInfo = DefaultClassicSkin.SkinInfo;
} }
CurrentSkinInfo.Value = skinInfo ?? DefaultSkinTriangles.SkinInfo; CurrentSkinInfo.Value = skinInfo ?? DefaultSkinTriangles.SkinInfo;

10
osu.Game/Tests/Visual/SkinnableTestScene.cs
View File

@ -29,8 +29,9 @@ namespace osu.Game.Tests.Visual
{ {
public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
{ {
private TrianglesSkin trianglesSkin;
private Skin metricsSkin; private Skin metricsSkin;
private Skin trianglesSkin; private Skin legacySkin;
private Skin specialSkin; private Skin specialSkin;
private Skin oldSkin; private Skin oldSkin;
@ -47,8 +48,9 @@ namespace osu.Game.Tests.Visual
{ {
var dllStore = new DllResourceStore(GetType().Assembly); var dllStore = new DllResourceStore(GetType().Assembly);
trianglesSkin = new TrianglesSkin(this);
metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true); metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
trianglesSkin = new DefaultLegacySkin(this); legacySkin = new DefaultLegacySkin(this);
specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true); specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true); oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
} }
@ -61,9 +63,9 @@ namespace osu.Game.Tests.Visual
var beatmap = CreateBeatmapForSkinProvider(); var beatmap = CreateBeatmapForSkinProvider();
Cell(0).Child = createProvider(null, creationFunction, beatmap); Cell(0).Child = createProvider(trianglesSkin, creationFunction, beatmap);
Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap); Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
Cell(2).Child = createProvider(trianglesSkin, creationFunction, beatmap); Cell(2).Child = createProvider(legacySkin, creationFunction, beatmap);
Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap); Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap); Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
} }