Add/Remove DrawableHitObject methods in laned playefields

LumpBloom7 · Jun 19, 2024 · c2a6c5b · c2a6c5b
1 parent 47a3f36
commit c2a6c5b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 2 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs b/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
@@ -75,8 +76,24 @@ public override bool Remove(HitObject hitObject)
             if (hitObject is not SentakkiLanedHitObject lanedHitObject)
                 return false;
 
-            HitObjectLineRenderer.RemoveHitObject(lanedHitObject);
-            return Lanes[lanedHitObject.Lane].Remove(hitObject: lanedHitObject);
+            return Lanes[lanedHitObject.Lane].Remove(lanedHitObject);
+        }
+        public override void Add(DrawableHitObject h)
+        {
+            switch (h)
+            {
+                case DrawableSentakkiLanedHitObject laned:
+                    Lanes[laned.HitObject.Lane].Add(h);
+                    break;
+            }
+        }
+
+        public override bool Remove(DrawableHitObject hitObject)
+        {
+            if (hitObject is not DrawableSentakkiLanedHitObject lanedHitObject)
+                return false;
+
+            return Lanes[lanedHitObject.HitObject.Lane].Remove(lanedHitObject);
         }
 
         private void onHitObjectLoaded(Drawable hitObject)

diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiPlayfield.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiPlayfield.cs
@@ -157,6 +157,39 @@ public override bool Remove(HitObject h)
             }
         }
 
+        public override void Add(DrawableHitObject h)
+        {
+            switch (h)
+            {
+                case SentakkiLanedHitObject:
+                    LanedPlayfield.Add(h);
+                    break;
+
+                case Touch:
+                    touchPlayfield.Add(h);
+                    break;
+
+                default:
+                    base.Add(h);
+                    break;
+            }
+        }
+
+        public override bool Remove(DrawableHitObject h)
+        {
+            switch (h)
+            {
+                case SentakkiLanedHitObject:
+                    return LanedPlayfield.Remove(h);
+
+                case Touch:
+                    return touchPlayfield.Remove(h);
+                default:
+                    return base.Remove(h);
+            }
+        }
+
+
         private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value || judgedObject is not DrawableSentakkiHitObject sentakkiHitObject)