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

Add FindProvider lookup function

Browse Source
This commit is contained in:
Dean Herbert
2021-05-31 17:04:38 +09:00
parent 1d30791ab0
commit 88ed95e012
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
View File

@ -69,10 +69,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
private void sourceChanged() private void sourceChanged()
{ {
isLegacySkin = new Lazy<bool>(() => Source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null); isLegacySkin = new Lazy<bool>(() => Source.FindProvider(s => s.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null) != null);
hasKeyTexture = new Lazy<bool>(() => Source.GetAnimation( hasKeyTexture = new Lazy<bool>(() => Source.FindProvider(s => s.GetAnimation(
this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value
?? "mania-key1", true, true) != null); ?? "mania-key1", true, true) != null) != null);
} }
public override Drawable GetDrawableComponent(ISkinComponent component) public override Drawable GetDrawableComponent(ISkinComponent component)

2
osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
private void sourceChanged() private void sourceChanged()
{ {
hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null); hasHitCircle = new Lazy<bool>(Source.FindProvider(s => s.GetTexture("hitcircle") != null) != null);
} }
public override Drawable GetDrawableComponent(ISkinComponent component) public override Drawable GetDrawableComponent(ISkinComponent component)

8
osu.Game/Skinning/ISkin.cs
View File

@ -57,5 +57,13 @@ namespace osu.Game.Skinning
/// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns> /// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns>
[CanBeNull] [CanBeNull]
IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup); IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
/// <summary>
/// For the specified texture, find any potential skin that can fulfill the lookup.
/// This should be used for cases where subsequent lookups (for related components) need to occur on the same skin.
/// </summary>
/// <returns>The skin to be used for subsequent lookups, or <c>null</c> if none is available.</returns>
[CanBeNull]
ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
} }
} }

11
osu.Game/Skinning/LegacySkin.cs
View File

@ -556,5 +556,16 @@ namespace osu.Game.Skinning
Textures?.Dispose(); Textures?.Dispose();
Samples?.Dispose(); Samples?.Dispose();
} }
ISkin ISkin.FindProvider(Func<ISkin, bool> lookupFunction)
{
if (lookupFunction(this))
return this;
if (!fallbackToDefault)
return null;
return (legacyDefaultFallback as ISkin)?.FindProvider(lookupFunction);
}
} }
} }

8
osu.Game/Skinning/SkinProvidingContainer.cs
View File

@ -41,6 +41,14 @@ namespace osu.Game.Skinning
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
} }
public ISkin FindProvider(Func<ISkin, bool> lookupFunction)
{
if (lookupFunction(skin))
return skin;
return fallbackSource.FindProvider(lookupFunction);
}
public Drawable GetDrawableComponent(ISkinComponent component) public Drawable GetDrawableComponent(ISkinComponent component)
{ {
Drawable sourceDrawable; Drawable sourceDrawable;