Initial implementation of hyperdash calculation

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs

@@ -1,9 +1,13 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects.Types;
+using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.Beatmaps
 {
@@ -40,7 +44,46 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private void convertHyperDash(List<CatchHitObject> objects)
         {
+            // todo: add difficulty adjust.
+            const double catcher_width = CatcherArea.CATCHER_SIZE / CatchPlayfield.BASE_WIDTH;
+            const double catcher_width_half = catcher_width / 2;
 
+            int lastDirection = 0;
+            double lastExcess = catcher_width_half;
+
+            int objCount = objects.Count;
+
+            for (int i = 0; i < objCount - 1; i++)
+            {
+                CatchHitObject currentObject = objects[i];
+
+                // not needed?
+                if (currentObject is TinyDroplet) continue;
+
+                CatchHitObject nextObject = objects[i + 1];
+                while (nextObject is TinyDroplet)
+                {
+                    if (++i == objCount - 1) break;
+                    nextObject = objects[i + 1];
+                }
+
+                int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
+                double timeToNext = nextObject.StartTime - ((currentObject as IHasEndTime)?.EndTime ?? currentObject.StartTime) - 4;
+                double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : catcher_width_half);
+
+                if (timeToNext * CatcherArea.Catcher.BASE_SPEED < distanceToNext)
+                {
+                    currentObject.HyperDash = true;
+                    lastExcess = catcher_width_half;
+                }
+                else
+                {
+                    //currentObject.DistanceToHyperDash = timeToNext - distanceToNext;
+                    lastExcess = MathHelper.Clamp(timeToNext - distanceToNext, 0, catcher_width_half);
+                }
+
+                lastDirection = thisDirection;
+            }
         }
     }
 }

osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs

@@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public float Scale { get; set; } = 1;
 
+        public bool HyperDash { get; set; }
+
         public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaults(controlPointInfo, difficulty);

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -70,6 +71,20 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     }
                 }
             };
+
+            if (HitObject.HyperDash)
+            {
+                Add(new Pulp
+                {
+                    RelativePositionAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AccentColour = Color4.Red,
+                    Blending = BlendingMode.Additive,
+                    Alpha = 0.5f,
+                    Scale = new Vector2(2)
+                });
+            }
         }
     }
 }

osu.Game.Rulesets.Catch/Tests/TestCaseHyperdash.cs

@@ -1,26 +1,26 @@
-using NUnit.Framework;
+using NUnit.Framework;
-using osu.Game.Beatmaps;
+using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects;
-
+
-namespace osu.Game.Rulesets.Catch.Tests
+namespace osu.Game.Rulesets.Catch.Tests
-{
+{
-    [TestFixture]
+    [TestFixture]
-    [Ignore("getting CI working")]
+    [Ignore("getting CI working")]
-    public class TestCaseHyperdash : Game.Tests.Visual.TestCasePlayer
+    public class TestCaseHyperdash : Game.Tests.Visual.TestCasePlayer
-    {
+    {
-        public TestCaseHyperdash()
+        public TestCaseHyperdash()
-            : base(typeof(CatchRuleset))
+            : base(typeof(CatchRuleset))
-        {
+        {
-        }
+        }
-
+
-        protected override Beatmap CreateBeatmap()
+        protected override Beatmap CreateBeatmap()
-        {
+        {
-            var beatmap = new Beatmap();
+            var beatmap = new Beatmap();
-
+
-            for (int i = 0; i < 512; i++)
+            for (int i = 0; i < 512; i++)
-                beatmap.HitObjects.Add(new Fruit { X = 0.5f + (i % 2 == 0 ? -0.4f : 0.4f), StartTime = i * 100, NewCombo = i % 8 == 0 });
+                beatmap.HitObjects.Add(new Fruit { X = 0.5f + (i % 8 < 4 ? -0.4f : 0.4f), StartTime = i * 100, NewCombo = i % 8 == 0 });
-
+
-            return beatmap;
+            return beatmap;
-        }
+        }
-    }
+    }
-}
+}

osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchPlayfield : ScrollingPlayfield
     {
-        public static readonly float BASE_WIDTH = 512;
+        public const float BASE_WIDTH = 512;
 
         protected override Container<Drawable> Content => content;
         private readonly Container<Drawable> content;