Make judgements follow hitcircles and enable them in magnetised, repel and depth

osu.Game.Rulesets.Osu/Mods/OsuModDepth.cs

@@ -47,9 +47,8 @@ public class OsuModDepth : ModWithVisibilityAdjustment, IUpdatableByPlayfield, I
 
  public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
  {
- // Hide judgment displays and follow points as they won't make any sense.
+ // Hide follow points as they won't make any sense.
  // Judgements can potentially be turned on in a future where they display at a position relative to their drawable counterpart.
- drawableRuleset.Playfield.DisplayJudgements.Value = false;
  (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
  }
 

osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs

@@ -39,9 +39,8 @@ internal class OsuModMagnetised : Mod, IUpdatableByPlayfield, IApplicableToDrawa
 
  public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
  {
- // Hide judgment displays and follow points as they won't make any sense.
+ // Hide follow points as they won't make any sense.
  // Judgements can potentially be turned on in a future where they display at a position relative to their drawable counterpart.
- drawableRuleset.Playfield.DisplayJudgements.Value = false;
  (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
  }
 

osu.Game.Rulesets.Osu/Mods/OsuModRepel.cs

@@ -38,9 +38,8 @@ internal class OsuModRepel : Mod, IUpdatableByPlayfield, IApplicableToDrawableRu
 
  public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
  {
- // Hide judgment displays and follow points as they won't make any sense.
+ // Hide follow points as they won't make any sense.
  // Judgements can potentially be turned on in a future where they display at a position relative to their drawable counterpart.
- drawableRuleset.Playfield.DisplayJudgements.Value = false;
  (drawableRuleset.Playfield as OsuPlayfield)?.FollowPoints.Hide();
  }
 

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs

@@ -39,10 +39,21 @@ protected override void PrepareForUse()
  Lighting.ResetAnimation();
  Lighting.SetColourFrom(JudgedObject, Result);
 
- if (JudgedObject?.HitObject is OsuHitObject osuObject)
+ if (JudgedObject is DrawableOsuHitObject osuObject)
  {
- Position = osuObject.StackedEndPosition;
- Scale = new Vector2(osuObject.Scale);
+ Position = osuObject.ToSpaceOfOtherDrawable(osuObject.OriginPosition, Parent!);
+ Scale = new Vector2(osuObject.HitObject.Scale);
+ }
+ }
+
+ protected override void Update()
+ {
+ base.Update();
+
+ if (JudgedObject is DrawableOsuHitObject osuObject && Parent != null && osuObject.HitObject != null)
+ {
+ Position = osuObject.ToSpaceOfOtherDrawable(osuObject.OriginPosition, Parent!);
+ Scale = new Vector2(osuObject.HitObject.Scale);
  }
  }
 

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -20,7 +20,7 @@ public partial class DrawableSliderTick : DrawableOsuHitObject
 
  public const float DEFAULT_TICK_SIZE = 16;
 
- protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
+ public DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
  private SkinnableDrawable scaleContainer;
 

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -248,6 +248,8 @@ private void updateNestedPositions()
 
  if (TailCircle != null)
  TailCircle.Position = EndPosition;
+
+ // Positions of other nested hitobjects are not updated
  }
 
  protected void UpdateNestedSamples()