From 4228977c866becfb4710349cf86c654d166a4817 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 30 Nov 2020 13:46:02 +0900
Subject: [PATCH] Store a DHO in `FruitPiece` to animate itself.

---
 .../Objects/Drawables/DrawableFruit.cs        | 12 +------
 .../Objects/Drawables/Pieces/FruitPiece.cs    | 33 +++++++++++++------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index e98f410724..4338d80345 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
 
-        private FruitPiece fruitPiece;
-
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
@@ -41,21 +39,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(getComponent(VisualRepresentation.Value)),
-                _ => fruitPiece = new FruitPiece
+                _ => new FruitPiece
                 {
                     VisualRepresentation = { BindTarget = VisualRepresentation },
                     HyperDash = { BindTarget = HyperDash },
                 });
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (fruitPiece != null)
-                fruitPiece.Border.Alpha = (float)Math.Clamp((StartTimeBindable.Value - Time.Current) / 500, 0, 1);
-        }
-
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
         {
             switch (hitObjectVisualRepresentation)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
index f7d931ad5b..25fc53ce21 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/FruitPiece.cs
@@ -1,10 +1,13 @@
 // 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 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;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
@@ -18,26 +21,36 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
         public readonly Bindable<bool> HyperDash = new Bindable<bool>();
 
-        public BorderPiece Border { get; private set; }
+        [CanBeNull]
+        private DrawableCatchHitObject drawableHitObject;
+
+        [CanBeNull]
+        private BorderPiece borderPiece;
 
         public FruitPiece()
         {
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load([CanBeNull] DrawableHitObject drawable)
         {
-            AddRangeInternal(new[]
-            {
-                getFruitFor(VisualRepresentation.Value),
-                Border = new BorderPiece(),
-            });
+            drawableHitObject = (DrawableCatchHitObject)drawable;
+
+            AddInternal(getFruitFor(VisualRepresentation.Value));
+
+            // if it is not part of a DHO, the border is always invisible.
+            if (drawableHitObject != null)
+                AddInternal(borderPiece = new BorderPiece());
 
             if (HyperDash.Value)
-            {
                 AddInternal(new HyperBorderPiece());
-            }
+        }
+
+        protected override void Update()
+        {
+            if (borderPiece != null && drawableHitObject.HitObject != null)
+                borderPiece.Alpha = (float)Math.Clamp((drawableHitObject.HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 
         private Drawable getFruitFor(FruitVisualRepresentation representation)