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

Improve legacy circle texture lookup to match 1:1 with stable

Browse Source
This commit is contained in:
Salman Ahmed
2022-04-19 07:12:05 +03:00
parent 8d0dd3961e
commit ec7bb876b5
1 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
View File

@ -23,9 +23,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
public override bool RemoveCompletedTransforms => false; public override bool RemoveCompletedTransforms => false;
private readonly string priorityLookup;
private readonly bool hasNumber; private readonly bool hasNumber;
private string priorityLookup;
public LegacyMainCirclePiece(string priorityLookup = null, bool hasNumber = true) public LegacyMainCirclePiece(string priorityLookup = null, bool hasNumber = true)
{ {
this.priorityLookup = priorityLookup; this.priorityLookup = priorityLookup;
@ -56,21 +57,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
var drawableOsuObject = (DrawableOsuHitObject)drawableObject; var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
bool allowFallback = false;
// attempt lookup using priority specification // attempt lookup using priority specification
Texture baseTexture = getTextureWithFallback(string.Empty); Texture baseTexture = getTexture(string.Empty);
// if the base texture was not found without a fallback, switch on fallback mode and re-perform the lookup. // if the base texture was not found using the priority specification, nullify the specification and fall back to "hitcircle".
if (baseTexture == null) if (baseTexture == null)
{ {
allowFallback = true; priorityLookup = null;
baseTexture = getTextureWithFallback(string.Empty); baseTexture = getTexture(string.Empty);
} }
// at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it. // at this point, any further texture fetches should be correctly using the priority source if the base texture was retrieved using it.
// the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist. // the flow above handles the case where a sliderendcircle.png is retrieved from the skin, but sliderendcircleoverlay.png doesn't exist.
// expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png (potentially from the default/fall-through skin). // expected behaviour in this scenario is not showing the overlay, rather than using hitcircleoverlay.png.
InternalChildren = new[] InternalChildren = new[]
{ {
@ -83,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Child = hitCircleOverlay = new KiaiFlashingDrawable(() => getAnimationWithFallback(@"overlay", 1000 / 2d)) Child = hitCircleOverlay = new KiaiFlashingDrawable(() => getAnimation(@"overlay", 1000 / 2d))
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -115,35 +114,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable); indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
} }
Texture getTextureWithFallback(string name) Texture getTexture(string name)
{ => skin.GetTexture($"{priorityLookup ?? @"hitcircle"}{name}");
Texture tex = null;
if (!string.IsNullOrEmpty(priorityLookup)) Drawable getAnimation(string name, double frameLength)
{ => skin.GetAnimation($"{priorityLookup ?? @"hitcircle"}{name}", true, true, frameLength: frameLength);
tex = skin.GetTexture($"{priorityLookup}{name}");
if (!allowFallback)
return tex;
}
return tex ?? skin.GetTexture($"hitcircle{name}");
}
Drawable getAnimationWithFallback(string name, double frameLength)
{
Drawable animation = null;
if (!string.IsNullOrEmpty(priorityLookup))
{
animation = skin.GetAnimation($"{priorityLookup}{name}", true, true, frameLength: frameLength);
if (!allowFallback)
return animation;
}
return animation ?? skin.GetAnimation($"hitcircle{name}", true, true, frameLength: frameLength);
}
} }
protected override void LoadComplete() protected override void LoadComplete()