Merge pull request #12303 from smoogipoo/fix-last-control-point-segmenting

Make last control point not able to make an implicit segment

osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs

@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
+        [TestCase("multi-segment-slider")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)

osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json

@@ -0,0 +1,36 @@
+{
+    "Mappings": [{
+        "StartTime": 347893,
+        "Objects": [{
+                "StartTime": 347893,
+                "EndTime": 347893,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348193,
+                "EndTime": 348193,
+                "X": 183.0447,
+                "Y": 245.24292,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348457,
+                "EndTime": 348457,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            }
+        ]
+    }]
+}

osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu

@@ -0,0 +1,17 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8
+SliderMultiplier:2
+SliderTickRate:1
+
+[TimingPoints]
+337093,300,4,2,1,40,1,0
+
+[HitObjects]
+329,245,347893,2,0,B|319:311|199:343|183:245|183:245,2,200,8|8|8,0:0|0:0|0:0,0:0:0:0:

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -707,6 +707,39 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(third.ControlPoints[5].Type.Value, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(480, 0)));
                 Assert.That(third.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
+                // Last control point duplicated
+                var fourth = ((IHasPath)decoded.HitObjects[3]).Path;
+
+                Assert.That(fourth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fourth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fourth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fourth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fourth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                // Last control point in segment duplicated
+                var fifth = ((IHasPath)decoded.HitObjects[4]).Path;
+
+                Assert.That(fifth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fifth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fifth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fifth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                Assert.That(fifth.ControlPoints[5].Position.Value, Is.EqualTo(new Vector2(4, 4)));
+                Assert.That(fifth.ControlPoints[5].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(5, 5)));
+                Assert.That(fifth.ControlPoints[6].Type.Value, Is.EqualTo(null));
             }
         }
     }

osu.Game.Tests/Resources/multi-segment-slider.osu

@@ -9,3 +9,9 @@ osu file format v128
 
 // Implicit multi-segment
 32,192,3000,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+
+// Last control point duplicated
+0,0,4000,2,0,B|1:1|2:2|3:3|3:3,2,200
+
+// Last control point in segment duplicated
+0,0,5000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -329,7 +329,13 @@ namespace osu.Game.Beatmaps.Formats
 
                 if (point.Type.Value != null)
                 {
-                    if (point.Type.Value != lastType)
+                    // We've reached a new segment!
+
+                    // To preserve compatibility with osu-stable as much as possible, segments with the same type are converted to use implicit segments by duplicating the control point.
+                    // One exception to this is when the last control point of the last segment was itself a duplicate, which can't be supported by osu-stable.
+                    bool lastPointWasDuplicate = i > 1 && pathData.Path.ControlPoints[i - 1].Position.Value == pathData.Path.ControlPoints[i - 2].Position.Value;
+
+                    if (lastPointWasDuplicate || point.Type.Value != lastType)
                     {
                         switch (point.Type.Value)
                         {

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -336,9 +336,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             while (++endIndex < vertices.Length - endPointLength)
             {
+                // Keep incrementing while an implicit segment doesn't need to be started
                 if (vertices[endIndex].Position.Value != vertices[endIndex - 1].Position.Value)
                     continue;
 
+                // The last control point of each segment is not allowed to start a new implicit segment.
+                if (endIndex == vertices.Length - endPointLength - 1)
+                    continue;
+
                 // Force a type on the last point, and return the current control point set as a segment.
                 vertices[endIndex - 1].Type.Value = type;
                 yield return vertices.AsMemory().Slice(startIndex, endIndex - startIndex);