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

Use ILive for Skin.SkinInfo

Browse Source
This commit is contained in:
Dean Herbert 2021-11-29 18:02:09 +09:00
parent cd0c811ab1
commit 6b55de2845
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Skinning/Skin.cs
View File

@ -15,6 +15,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Database;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.IO; using osu.Game.IO;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
@ -23,7 +24,7 @@ namespace osu.Game.Skinning
{ {
public abstract class Skin : IDisposable, ISkin public abstract class Skin : IDisposable, ISkin
{ {
public readonly SkinInfo SkinInfo; public readonly ILive<SkinInfo> SkinInfo;
private readonly IStorageResourceProvider resources; private readonly IStorageResourceProvider resources;
public SkinConfiguration Configuration { get; set; } public SkinConfiguration Configuration { get; set; }
@ -42,7 +43,7 @@ namespace osu.Game.Skinning
protected Skin(SkinInfo skin, IStorageResourceProvider resources, [CanBeNull] Stream configurationStream = null) protected Skin(SkinInfo skin, IStorageResourceProvider resources, [CanBeNull] Stream configurationStream = null)
{ {
SkinInfo = skin; SkinInfo = skin.ToLive();
this.resources = resources; this.resources = resources;
configurationStream ??= getConfigurationStream(); configurationStream ??= getConfigurationStream();
@ -53,13 +54,16 @@ namespace osu.Game.Skinning
else else
Configuration = new SkinConfiguration(); Configuration = new SkinConfiguration();
// skininfo files may be null for default skin.
SkinInfo.PerformRead(s =>
{
// we may want to move this to some kind of async operation in the future. // we may want to move this to some kind of async operation in the future.
foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget))) foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
{ {
string filename = $"{skinnableTarget}.json"; string filename = $"{skinnableTarget}.json";
// skininfo files may be null for default skin. // skininfo files may be null for default skin.
var fileInfo = SkinInfo.Files.FirstOrDefault(f => f.Filename == filename); var fileInfo = s.Files.FirstOrDefault(f => f.Filename == filename);
if (fileInfo == null) if (fileInfo == null)
continue; continue;
@ -84,6 +88,7 @@ namespace osu.Game.Skinning
Logger.Error(ex, "Failed to load skin configuration."); Logger.Error(ex, "Failed to load skin configuration.");
} }
} }
});
} }
protected virtual void ParseConfigurationStream(Stream stream) protected virtual void ParseConfigurationStream(Stream stream)
@ -94,7 +99,7 @@ namespace osu.Game.Skinning
private Stream getConfigurationStream() private Stream getConfigurationStream()
{ {
string path = SkinInfo.Files.SingleOrDefault(f => f.Filename.Equals(@"skin.ini", StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath(); string path = SkinInfo.PerformRead(s => s.Files.SingleOrDefault(f => f.Filename.Equals(@"skin.ini", StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath());
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
return null; return null;