h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Revert SkinnableSprite lookups to old behaviour

Browse Source
This commit is contained in:
Dean Herbert 2019-09-03 14:21:54 +09:00
parent 10862f40c6
commit d1cdf49dd5
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/CatchSkinComponent.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch
{
}
protected override string RulesetPrefix => CatchRuleset.SHORT_NAME;
protected override string RulesetPrefix => "catch"; // todo: use CatchRuleset.SHORT_NAME;
protected override string ComponentName => Component.ToString().ToLower();
}

1
osu.Game.Rulesets.Catch/CatchSkinComponents.cs
View File

@ -5,6 +5,5 @@ namespace osu.Game.Rulesets.Catch
{
public enum CatchSkinComponents
{
Catcher
}
}

2
osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.UI
[BackgroundDependencyLoader]
private void load()
{
InternalChild = new SkinnableSprite(new CatchSkinComponent(CatchSkinComponents.Catcher))
InternalChild = new SkinnableSprite("Gameplay/catch/fruit-catcher-idle")
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
private class SkinnableApproachCircle : SkinnableSprite
{
public SkinnableApproachCircle()
: base(new OsuSkinComponent(OsuSkinComponents.ApproachCircle))
: base("Gameplay/osu/approachcircle")
{
}

16
osu.Game/Skinning/SkinnableSprite.cs
View File

@ -19,11 +19,23 @@ namespace osu.Game.Skinning
[Resolved]
private TextureStore textures { get; set; }
public SkinnableSprite(ISkinComponent component, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.ScaleDownToFit)
: base(component, allowFallback, confineMode)
public SkinnableSprite(string textureName, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.ScaleDownToFit)
: base(new SpriteComponent(textureName), allowFallback, confineMode)
{
}
protected override Drawable CreateDefault(ISkinComponent component) => new Sprite { Texture = textures.Get(component.LookupName) };
private class SpriteComponent : ISkinComponent
{
private readonly string textureName;
public SpriteComponent(string textureName)
{
this.textureName = textureName;
}
public string LookupName => textureName;
}
}
}