From 8f61f5e4c6c60d0c8933756929f16efd6728f279 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 5 Jul 2023 18:41:32 +0900 Subject: [PATCH] Cache `Playfield` for the sake of tests I'm open to an alternative. Name it. --- osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs | 4 ++-- osu.Game/Rulesets/UI/Playfield.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs index 4f727e8c90..2797492b0a 100644 --- a/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs +++ b/osu.Game.Rulesets.Taiko/UI/DrumSamplePlayer.cs @@ -25,9 +25,9 @@ namespace osu.Game.Rulesets.Taiko.UI private TaikoAction? lastAction; [BackgroundDependencyLoader] - private void load(DrawableRuleset drawableRuleset) + private void load(Playfield playfield) { - var hitObjectContainer = drawableRuleset.Playfield.HitObjectContainer; + var hitObjectContainer = playfield.HitObjectContainer; InternalChildren = new Drawable[] { leftCentreTrigger = CreateTriggerSource(hitObjectContainer, SampleBalance.Left), diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs index 6016a53918..3f263aba63 100644 --- a/osu.Game/Rulesets/UI/Playfield.cs +++ b/osu.Game/Rulesets/UI/Playfield.cs @@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.UI { [Cached(typeof(IPooledHitObjectProvider))] [Cached(typeof(IPooledSampleProvider))] + [Cached] public abstract partial class Playfield : CompositeDrawable, IPooledHitObjectProvider, IPooledSampleProvider { ///