From 2133ba38e5caadf1698fec032caff5ed8c6bea25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 19:06:08 +0900
Subject: [PATCH] Add overlay layer

---
 .../Skinning/CatchLegacySkinTransformer.cs    |  6 ++-
 .../Skinning/LegacyFruitPiece.cs              | 53 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index c1e164ed5b..20bd086199 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -32,7 +32,11 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 case CatchSkinComponents.FruitOrange:
                 case CatchSkinComponents.FruitGrapes:
                 case CatchSkinComponents.FruitPear:
-                    return this.GetAnimation(catchSkinComponent.Component.ToString().Underscore().Hyphenate(), true, false, true);
+                    var lookupName = catchSkinComponent.Component.ToString().Underscore().Hyphenate();
+                    if (GetTexture(lookupName) != null)
+                        return new LegacyFruitPiece(lookupName);
+
+                    break;
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
new file mode 100644
index 0000000000..fbe682e512
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -0,0 +1,53 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    internal class LegacyFruitPiece : CompositeDrawable
+    {
+        private readonly string lookupName;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        public LegacyFruitPiece(string lookupName)
+        {
+            this.lookupName = lookupName;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableObject, ISkinSource skin)
+        {
+            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+
+            accentColour.BindTo(drawableCatchObject.AccentColour);
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture(lookupName),
+                    Colour = drawableObject.AccentColour.Value,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new Sprite
+                {
+                    Texture = skin.GetTexture($"{lookupName}-overlay"),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+    }
+}