From cdff6060d3eccdf3ed36df6ce0d3aa26dc411a17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 13:01:27 +0900
Subject: [PATCH] Remove recursive hierarchy traversal for mania sample balance

---
 .../Objects/Drawables/DrawableManiaHitObject.cs  | 16 +++++++++-------
 osu.Game/Rulesets/UI/Playfield.cs                |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index ce56fd222c..a708adb493 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -5,10 +5,10 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -26,17 +26,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
+        [Resolved(canBeNull: true)]
+        private Playfield playfield { get; set; }
+
         protected override float SamplePlaybackPosition
         {
             get
             {
-                CompositeDrawable stage = this;
-                while (!(stage is Stage))
-                    stage = stage.Parent;
+                var columns = (playfield as ManiaPlayfield)?.TotalColumns;
 
-                var columnCount = ((Stage)stage).Columns.Count;
-                var columnIndex = HitObject.Column;
-                return 0.8f * columnIndex / (columnCount - 1) - 0.4f;
+                if (columns == null)
+                    return base.SamplePlaybackPosition;
+
+                return (float)HitObject.Column / columns.Value;
             }
         }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c52183f3f2..fc6906560b 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -15,6 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
+    [Cached]
     public abstract class Playfield : CompositeDrawable
     {
         /// <summary>