Adjust Laned Highlights to better represent timings

Allows for better visual representation when adjusting time via snapping. Hold notes also keep their full length
LumpBloom7 · Oct 31, 2023 · 9637d3f · 9637d3f
1 parent b7470cc
commit 9637d3f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Holds/HoldSelectionBlueprint.cs b/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Holds/HoldSelectionBlueprint.cs
@@ -1,4 +1,5 @@
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables;
@@ -19,13 +20,16 @@ public HoldSelectionBlueprint(Hold hitObject)
             InternalChild = highlight = new HoldHighlight();
         }
 
+        [Resolved]
+        private SentakkiSnapGrid snapGrid { get; set; } = null!;
+
         protected override void Update()
         {
             base.Update();
 
             highlight.Rotation = DrawableObject.HitObject.Lane.GetRotationForLane();
-            highlight.Note.Y = Math.Max(DrawableObject.NoteBody.Y, -SentakkiPlayfield.INTERSECTDISTANCE);
-            highlight.Note.Height = DrawableObject.NoteBody.Height;
+            highlight.Note.Y = -snapGrid.GetDistanceRelativeToCurrentTime(HitObject.StartTime, SentakkiPlayfield.NOTESTARTDISTANCE);
+            highlight.Note.Height = -snapGrid.GetDistanceRelativeToCurrentTime(HitObject.EndTime, SentakkiPlayfield.NOTESTARTDISTANCE) - highlight.Note.Y;
             highlight.Note.Scale = DrawableObject.NoteBody.Scale;
         }
 

diff --git a/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Slides/SlideSelectionBlueprint.cs b/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Slides/SlideSelectionBlueprint.cs
@@ -1,4 +1,5 @@
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -60,6 +61,9 @@ protected override void Update()
             updateSlideBodyHighlights();
         }
 
+        [Resolved]
+        private SentakkiSnapGrid snapGrid { get; set; } = null!;
+
         private void updateTapHighlight()
         {
             var slideTap = DrawableObject.SlideTaps.Child;
@@ -68,7 +72,7 @@ private void updateTapHighlight()
             tapHighlight.SlideTapPiece.Stars.Rotation = ((SlideTapPiece)slideTap.TapVisual).Stars.Rotation;
             tapHighlight.SlideTapPiece.SecondStar.Alpha = ((SlideTapPiece)slideTap.TapVisual).SecondStar.Alpha;
             tapHighlight.Rotation = DrawableObject.HitObject.Lane.GetRotationForLane();
-            tapHighlight.SlideTapPiece.Y = Math.Max(slideTap.TapVisual.Y, -SentakkiPlayfield.INTERSECTDISTANCE);
+            tapHighlight.SlideTapPiece.Y = -snapGrid.GetDistanceRelativeToCurrentTime(DrawableObject.HitObject.StartTime, SentakkiPlayfield.NOTESTARTDISTANCE);
         }
 
         private void updateSlideBodyHighlights()

diff --git a/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Taps/TapSelectionBlueprint.cs b/osu.Game.Rulesets.Sentakki/Edit/Blueprints/Taps/TapSelectionBlueprint.cs
@@ -1,4 +1,5 @@
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables;
@@ -19,12 +20,15 @@ public TapSelectionBlueprint(Tap hitObject)
             InternalChild = highlight = new TapHighlight();
         }
 
+        [Resolved]
+        private SentakkiSnapGrid snapGrid { get; set; } = null!;
+
         protected override void Update()
         {
             base.Update();
 
             highlight.Rotation = DrawableObject.HitObject.Lane.GetRotationForLane();
-            highlight.Note.Y = Math.Max(DrawableObject.TapVisual.Y, -SentakkiPlayfield.INTERSECTDISTANCE);
+            highlight.Note.Y = -snapGrid.GetDistanceRelativeToCurrentTime(DrawableObject.HitObject.StartTime, SentakkiPlayfield.NOTESTARTDISTANCE);
             highlight.Note.Scale = DrawableObject.TapVisual.Scale;
         }