From 3fec213c928db64bb7dcb07bf6b468fb9d9e39c8 Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Tue, 7 Apr 2020 16:40:32 +0800
Subject: [PATCH] Added separate scrolling track to display drum roll notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index bde9085c23..b32e7b53da 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<HitExplosion> hitExplosionContainer;
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
+        private readonly ScrollingHitObjectContainer drumRollHitContainer;
         internal readonly HitTarget HitTarget;
 
         private readonly ProxyContainer topLevelHitContainer;
@@ -135,6 +136,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
                         },
+                        drumRollHitContainer = new ScrollingHitObjectContainer
+                        {
+                            Name = "Drumroll hit",
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Stretch,
+                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                            Width = 1.0f
+                        }
                     }
                 },
                 overlayBackgroundContainer = new Container
@@ -212,12 +221,28 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barlineContainer.Add(barline.CreateProxy());
                     break;
 
+                case DrawableDrumRoll drumRoll:
+                    drumRoll.OnHit += onDrumrollArbitraryHit;
+                    break;
+
                 case DrawableTaikoHitObject taikoObject:
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     break;
             }
         }
 
+        private void onDrumrollArbitraryHit(TaikoAction action)
+        {
+            DrawableHit drawableHit;
+
+            if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
+                drawableHit = new DrawableFlyingRimHit(Time.Current);
+            else
+                drawableHit = new DrawableFlyingCentreHit(Time.Current);
+
+            drumRollHitContainer.Add(drawableHit);
+        }
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)