Merge pull request #639 from LumpBloom7/SDF-chevrons

Draw slide chevrons using SDF shader
LumpBloom7 · Nov 15, 2024 · 9590703 · 9590703
2 parents 938fa16 + a22a315
commit 9590703
Show file tree

Hide file tree

Showing 18 changed files with 541 additions and 316 deletions.
diff --git a/osu.Game.Rulesets.Sentakki.Tests/Graphics/TestSceneChevronVisuals.cs b/osu.Game.Rulesets.Sentakki.Tests/Graphics/TestSceneChevronVisuals.cs
@@ -0,0 +1,43 @@
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Sentakki.Objects;
+using osu.Game.Rulesets.Sentakki.Objects.Drawables;
+using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Sentakki.Tests.Graphics
+{
+    [TestFixture]
+    public partial class TestSceneChevronVisual : OsuGridTestScene
+    {
+        protected override Ruleset CreateRuleset() => new SentakkiRuleset();
+        public TestSceneChevronVisual() : base(1, 2)
+        {
+            Cell(0).Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.White
+            });
+            Cell(1).Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.White
+            });
+            Cell(0).Add(new SlideChevron());
+            Cell(1).Add(new DrawableChevron()
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(80, 62.5f),
+                Thickness = 7
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Sentakki.Tests/Graphics/TestSceneFanChevronVisuals.cs b/osu.Game.Rulesets.Sentakki.Tests/Graphics/TestSceneFanChevronVisuals.cs
@@ -0,0 +1,117 @@
+using System;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Sentakki.Objects;
+using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
+using osu.Game.Rulesets.Sentakki.UI;
+using osu.Game.Rulesets.Sentakki.UI.Components;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Sentakki.Tests.Graphics
+{
+    [TestFixture]
+    public partial class TestSceneFanChevronVisual : OsuGridTestScene
+    {
+        protected override Ruleset CreateRuleset() => new SentakkiRuleset();
+        private readonly SlideVisual slide;
+
+        private readonly Container fanChevContainer;
+
+        [Cached]
+        private readonly DrawablePool<SlideChevron> chevronPool;
+        public TestSceneFanChevronVisual() : base(1, 2)
+        {
+            Cell(0).Add(chevronPool = new DrawablePool<SlideChevron>(62));
+            Cell(0).Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.White
+            });
+            Cell(0).Add(new SentakkiRing
+            {
+                RelativeSizeAxes = Axes.None,
+                Size = new Vector2(SentakkiPlayfield.RINGSIZE)
+            });
+            Cell(0).Add(slide = new SlideVisual());
+            Cell(0).Add(new SentakkiRing
+            {
+                RelativeSizeAxes = Axes.None,
+                Size = new Vector2(SentakkiPlayfield.RINGSIZE)
+            });
+            Cell(1).Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.White
+            });
+            Cell(1).Add(new SentakkiRing
+            {
+                RelativeSizeAxes = Axes.None,
+                Size = new Vector2(SentakkiPlayfield.RINGSIZE)
+            });
+            float rot = SentakkiExtensions.GetRotationForLane(4);
+            Cell(1).Add(fanChevContainer = new Container()
+            {
+                RelativeSizeAxes = Axes.None,
+                Size = new Vector2(600),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Rotation = rot,
+            });
+
+            Vector2 lineStart = SentakkiExtensions.GetPositionAlongLane(SentakkiPlayfield.INTERSECTDISTANCE, 0);
+            Vector2 middleLineEnd = SentakkiExtensions.GetPositionAlongLane(SentakkiPlayfield.INTERSECTDISTANCE, 4);
+            Vector2 middleLineDelta = middleLineEnd - lineStart;
+
+            for (int i = 0; i < 11; ++i)
+            {
+                float progress = (i + 2f) / 12f;
+
+                float scale = progress - (2f / 12);
+                var middlePosition = lineStart + (middleLineDelta * progress);
+
+                float t = 6.5f + (2.5f * scale);
+
+                float chevWidth = MathF.Abs(lineStart.X - middlePosition.X);
+
+                (float sin, float cos) = MathF.SinCos((-135 + 90f) / 180f * MathF.PI);
+
+                Vector2 secondPoint = new Vector2(sin, -cos) * chevWidth;
+                Vector2 one = new Vector2(chevWidth, 0);
+
+                var middle = (one + secondPoint) * 0.5f;
+                float h = (middle - Vector2.Zero).Length + (t * 3);
+
+                float w = (secondPoint - one).Length;
+
+                const float safe_space_ratio = (570 / 600f) * 600;
+
+                float y = safe_space_ratio * scale;
+
+                var fanChev = new DrawableChevron()
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = w + 30,
+                    Height = h + 30,
+                    Thickness = t,
+                    Y = -y + 300 - 50,
+                    FanChevron = true,
+                };
+
+                fanChevContainer.Add(fanChev);
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            slide.Path = SlidePaths.CreateSlidePath(new SlideBodyPart(SlidePaths.PathShapes.Fan, 4, false));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneAllSlides.cs
@@ -28,13 +28,9 @@ public partial class TestSceneAllSlides : OsuTestScene
         [Cached]
         private readonly DrawablePool<SlideChevron> chevronPool;
 
-        [Cached]
-        private readonly SlideFanChevrons fanChevrons;
-
         public TestSceneAllSlides()
         {
             Add(chevronPool = new DrawablePool<SlideChevron>(62));
-            Add(fanChevrons = new SlideFanChevrons());
 
             Add(new SentakkiRing
             {

diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneCircleChaining.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneCircleChaining.cs
@@ -28,13 +28,9 @@ public partial class TestSceneCircleChaining : OsuTestScene
         [Cached]
         private readonly DrawablePool<SlideChevron> chevronPool = null!;
 
-        [Cached]
-        private readonly SlideFanChevrons fanChevrons = null!;
-
         public TestSceneCircleChaining()
         {
             Add(chevronPool = new DrawablePool<SlideChevron>(62));
-            Add(fanChevrons = new SlideFanChevrons());
 
             Add(new SentakkiRing
             {

diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneFanSlide.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Sentakki.Objects;
 using osu.Game.Rulesets.Sentakki.Objects.Drawables.Pieces.Slides;
 using osu.Game.Rulesets.Sentakki.UI;
@@ -19,13 +20,14 @@ public partial class TestSceneFanSlide : OsuTestScene
         protected int EndPath;
 
         [Cached]
-        private readonly SlideFanChevrons fanChevrons;
+        private readonly DrawablePool<SlideChevron> chevronPool = null!;
+
 
         private readonly SlideVisual slide;
 
         public TestSceneFanSlide()
         {
-            Add(fanChevrons = new SlideFanChevrons());
+            Add(chevronPool = new DrawablePool<SlideChevron>(62));
 
             Add(new SentakkiRing
             {
@@ -38,6 +40,7 @@ public TestSceneFanSlide()
             AddSliderStep("Progress", 0.0f, 1.0f, 0.0f, p =>
             {
                 slide.Progress = p;
+                slide.UpdateChevronVisibility();
             });
 
             AddSliderStep("Rotation", 0.0f, 360f, 22.5f, p =>

diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneSlide.cs
@@ -33,13 +33,9 @@ public abstract partial class TestSceneSlide : OsuTestScene
         [Cached]
         private readonly DrawablePool<SlideChevron> chevronPool;
 
-        [Cached]
-        private readonly SlideFanChevrons fanChevrons;
-
         protected TestSceneSlide()
         {
             Add(chevronPool = new DrawablePool<SlideChevron>(62));
-            Add(fanChevrons = new SlideFanChevrons());
 
             Add(new SentakkiRing
             {
@@ -62,6 +58,7 @@ protected TestSceneSlide()
             AddSliderStep("Progress", 0.0f, 1.0f, 0.0f, p =>
             {
                 slide.Progress = p;
+                slide.UpdateChevronVisibility();
             });
 
             AddToggleStep("Mirrored", b =>

diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideFan.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Sentakki.Objects;
@@ -27,7 +28,7 @@ public partial class TestSceneSlideFan : OsuTestScene
         private int depthIndex;
 
         [Cached]
-        private readonly SlideFanChevrons fanChevrons;
+        private readonly DrawablePool<SlideChevron> chevronPool = null!;
 
         public TestSceneSlideFan()
         {
@@ -39,7 +40,7 @@ public TestSceneSlideFan()
                 Rotation = -22.5f
             });
 
-            Add(fanChevrons = new SlideFanChevrons());
+            Add(chevronPool = new DrawablePool<SlideChevron>(62));
 
             AddStep("Miss Single", () => testSingle(2000));
             AddStep("Hit Single", () => testSingle(2000, true));

diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/TestSceneSlideNote.cs
@@ -30,9 +30,6 @@ public partial class TestSceneSlideNote : OsuTestScene
         [Cached]
         private readonly DrawablePool<SlideChevron> chevronPool;
 
-        [Cached]
-        private readonly SlideFanChevrons fanChevrons;
-
         public TestSceneSlideNote()
         {
             base.Content.Add(content = new SentakkiInputManager(new SentakkiRuleset().RulesetInfo));
@@ -44,7 +41,6 @@ public TestSceneSlideNote()
             });
 
             Add(chevronPool = new DrawablePool<SlideChevron>(62));
-            Add(fanChevrons = new SlideFanChevrons());
 
             AddStep("Miss Single", () => testSingle(2000));
             AddStep("Hit Single", () => testSingle(2000, true));