Merge pull request #8824 from peppy/taiko-hittarget-skinning

Add support for taiko hit target skinning

osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoPlayfield.cs

@@ -0,0 +1,42 @@
+// 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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Taiko.Skinning;
+using osu.Game.Rulesets.Taiko.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests.Skinning
+{
+    public class TestSceneTaikoPlayfield : TaikoSkinnableTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Concat(new[]
+        {
+            typeof(HitTarget),
+            typeof(LegacyHitTarget),
+        }).ToList();
+
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 5000 },
+        };
+
+        public TestSceneTaikoPlayfield()
+        {
+            AddStep("Load playfield", () => SetContents(() => new TaikoPlayfield(new ControlPointInfo())
+            {
+                Height = 0.4f,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+            }));
+        }
+    }
+}

osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs

@@ -24,7 +24,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneTaikoPlayfield : OsuTestScene
+    public class TestSceneHits : OsuTestScene
     {
         private const double default_duration = 1000;
         private const float scroll_time = 1000;

osu.Game.Rulesets.Taiko/Skinning/LegacyHitTarget.cs

@@ -0,0 +1,41 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Skinning
+{
+    public class LegacyHitTarget : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture("approachcircle"),
+                    Scale = new Vector2(0.73f),
+                    Alpha = 0.7f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new Sprite
+                {
+                    Texture = skin.GetTexture("taikobigcircle"),
+                    Scale = new Vector2(0.7f),
+                    Alpha = 0.5f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+    }
+}

osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs

@@ -49,6 +49,12 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
                 case TaikoSkinComponents.DrumRollTick:
                     return this.GetAnimation("sliderscorepoint", false, false);
+
+                case TaikoSkinComponents.HitTarget:
+                    if (GetTexture("taikobigcircle") != null)
+                        return new LegacyHitTarget();
+
+                    return null;
             }
 
             return source.GetDrawableComponent(component);

osu.Game.Rulesets.Taiko/TaikoSkinComponents.cs

@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Taiko
         RimHit,
         DrumRollBody,
         DrumRollTick,
-        Swell
+        Swell,
+        HitTarget
     }
 }

osu.Game.Rulesets.Taiko/UI/HitTarget.cs

@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public HitTarget()
         {
+            RelativeSizeAxes = Axes.Both;
+
             Children = new Drawable[]
             {
                 new Box

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
-        internal readonly HitTarget HitTarget;
+        internal readonly Drawable HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
         private readonly ProxyContainer barlineContainer;
@@ -90,7 +91,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Masking = true,
-                            Children = new Drawable[]
+                            Children = new[]
                             {
                                 hitExplosionContainer = new Container<HitExplosion>
                                 {
@@ -98,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                                     FillMode = FillMode.Fit,
                                     Blending = BlendingParameters.Additive,
                                 },
-                                HitTarget = new HitTarget
+                                HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new HitTarget())
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.Centre,