Merge pull request #596 from LumpBloom7/Fix-mirror-mod

Avoid using bindables to swap note playfields
LumpBloom7 · Jun 29, 2024 · 42cb61f · 42cb61f
2 parents eee3d57 + 1d9f88a
commit 42cb61f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/LineLifetimeEntry.cs b/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/LineLifetimeEntry.cs
@@ -33,23 +33,21 @@ public LineLifetimeEntry(DrawableSentakkiRuleset? drawableSentakkiRuleset, doubl
 
         public void Add(SentakkiLanedHitObject hitObject)
         {
-            hitObject.LaneBindable.ValueChanged += onLaneChanged;
             hitObject.BreakBindable.ValueChanged += onBreakChanged;
+            hitObject.ColourBindable.ValueChanged += onColorChanged;
             HitObjects.AddInPlace(hitObject, Comparer<SentakkiLanedHitObject>.Create((lhs, rhs) => lhs.Lane.CompareTo(rhs.Lane)));
             UpdateLine();
         }
 
         public void Remove(SentakkiLanedHitObject hitObject)
         {
-            hitObject.LaneBindable.ValueChanged -= onLaneChanged;
             hitObject.BreakBindable.ValueChanged -= onBreakChanged;
             HitObjects.Remove(hitObject);
             UpdateLine();
         }
 
-        private void onLaneChanged(ValueChangedEvent<int> obj) => UpdateLine();
-
         private void onBreakChanged(ValueChangedEvent<bool> obj) => UpdateLine();
+        private void onColorChanged(ValueChangedEvent<Color4> obj) => UpdateLine();
 
         public Action<LineLifetimeEntry> OnLineUpdated = null!;
 

diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/LineRenderer.cs b/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/LineRenderer.cs
@@ -85,7 +85,11 @@ public void AddHitObject(SentakkiLanedHitObject hitObject)
 
         public void RemoveHitObject(SentakkiLanedHitObject hitObject)
         {
+            // Ensure that we don't continue to receive time changes
+            startTimeMap[hitObject].UnbindAll();
+
             startTimeMap.Remove(hitObject);
+
             removeHitObjectFromEntry(hitObject.StartTime, hitObject);
         }
 

diff --git a/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs b/osu.Game.Rulesets.Sentakki/UI/LanedPlayfield.cs
@@ -59,20 +59,13 @@ public LanedPlayfield()
             });
         }
 
-        public override void Add(HitObject h)
+        public override void Add(HitObject hitObject)
         {
-            switch (h)
-            {
-                case SentakkiLanedHitObject laned:
-                    HitObjectLineRenderer.AddHitObject(laned);
-                    laned.LaneBindable.BindValueChanged(lane =>
-                    {
-                        if (lane.OldValue != lane.NewValue)
-                            Lanes[lane.OldValue].Remove(h);
-                        Lanes[lane.NewValue].Add(h);
-                    }, true);
-                    break;
-            }
+            if (hitObject is not SentakkiLanedHitObject lanedHitObject)
+                return;
+
+            HitObjectLineRenderer.AddHitObject(lanedHitObject);
+            Lanes[lanedHitObject.Lane].Add(lanedHitObject);
         }
 
         public override bool Remove(HitObject hitObject)

diff --git a/osu.Game.Rulesets.Sentakki/UI/SentakkiPlayfield.cs b/osu.Game.Rulesets.Sentakki/UI/SentakkiPlayfield.cs
@@ -143,6 +143,20 @@ public override void Add(HitObject h)
             }
         }
 
+        public override bool Remove(HitObject 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)