RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 11:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21220 from peppy/fix-skinnable-sprite-lookups

Browse Source 
Fix `SkinnableSprite` lookups broken in lazer-first skins
This commit is contained in:
Dan Balasescu 2022-11-13 15:46:04 +09:00 committed by GitHub
commit 7b9ed6a4b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,21 +82,14 @@ namespace osu.Game.Skinning
public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup) public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
{ {
// Temporary until default skin has a valid hit lighting.
if ((lookup as SkinnableSprite.SpriteComponentLookup)?.LookupName == @"lighting") return Drawable.Empty();
if (base.GetDrawableComponent(lookup) is Drawable c) if (base.GetDrawableComponent(lookup) is Drawable c)
return c; return c;
switch (lookup) switch (lookup)
{ {
case SkinnableSprite.SpriteComponentLookup spriteLookup:
switch (spriteLookup.LookupName)
{
// Temporary until default skin has a valid hit lighting.
case @"lighting":
return Drawable.Empty();
}
break;
case GlobalSkinComponentLookup globalLookup: case GlobalSkinComponentLookup globalLookup:
switch (globalLookup.Lookup) switch (globalLookup.Lookup)
{ {

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

@ -396,9 +396,6 @@ namespace osu.Game.Skinning
} }
return null; return null;
case SkinnableSprite.SpriteComponentLookup sprite:
return this.GetAnimation(sprite.LookupName, false, false);
} }
return null; return null;

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

@ -158,6 +158,10 @@ namespace osu.Game.Skinning
{ {
switch (lookup) switch (lookup)
{ {
// This fallback is important for user skins which use SkinnableSprites.
case SkinnableSprite.SpriteComponentLookup sprite:
return this.GetAnimation(sprite.LookupName, false, false);
case GlobalSkinComponentLookup target: case GlobalSkinComponentLookup target:
if (!DrawableComponentInfo.TryGetValue(target.Lookup, out var skinnableInfo)) if (!DrawableComponentInfo.TryGetValue(target.Lookup, out var skinnableInfo))
return null; return null;

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

@ -60,21 +60,14 @@ namespace osu.Game.Skinning
public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup) public override Drawable? GetDrawableComponent(ISkinComponentLookup lookup)
{ {
// Temporary until default skin has a valid hit lighting.
if ((lookup as SkinnableSprite.SpriteComponentLookup)?.LookupName == @"lighting") return Drawable.Empty();
if (base.GetDrawableComponent(lookup) is Drawable c) if (base.GetDrawableComponent(lookup) is Drawable c)
return c; return c;
switch (lookup) switch (lookup)
{ {
case SkinnableSprite.SpriteComponentLookup spriteLookup:
switch (spriteLookup.LookupName)
{
// Temporary until default skin has a valid hit lighting.
case @"lighting":
return Drawable.Empty();
}
break;
case GlobalSkinComponentLookup target: case GlobalSkinComponentLookup target:
switch (target.Lookup) switch (target.Lookup)
{ {