Move constant for default ControlPoint out of Slider.

default0 · Feb 18, 2017 · 94dd268 · 94dd268
1 parent bf33cc6
commit 94dd268
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/osu.Game.Modes.Osu/Objects/Slider.cs b/osu.Game.Modes.Osu/Objects/Slider.cs
@@ -57,10 +57,10 @@ public override void SetDefaultsFromBeatmap(Beatmap beatmap)
             ControlPoint overridePoint;
             ControlPoint timingPoint = beatmap.TimingPointAt(StartTime, out overridePoint);
             var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
-            var baseVelocity = 100 * baseDifficulty.SliderMultiplier;
+            var baseVelocity = 100 * baseDifficulty.SliderMultiplier / velocityAdjustment;
 
-            Velocity = baseVelocity / ((timingPoint?.BeatLength ?? 500) * velocityAdjustment);
-            TickDistance = baseVelocity / (baseDifficulty.SliderTickRate * velocityAdjustment);
+            Velocity = baseVelocity / timingPoint.BeatLength;
+            TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
         }
 
         public int RepeatCount = 1;

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
@@ -55,7 +55,7 @@ public ControlPoint TimingPointAt(double time, out ControlPoint overridePoint)
                 else break;
             }
 
-            return timingPoint;
+            return timingPoint ?? ControlPoint.Default;
         }
     }
 }
diff --git a/osu.Game/Beatmaps/Timing/ControlPoint.cs b/osu.Game/Beatmaps/Timing/ControlPoint.cs
@@ -1,20 +1,21 @@
 // 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 System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace osu.Game.Beatmaps.Timing
 {
     public class ControlPoint
     {
+        public static ControlPoint Default = new ControlPoint
+        {
+            BeatLength = 500,
+            TimingChange = true,
+        };
+
         public double Time;
         public double BeatLength;
         public double VelocityAdjustment;
         public bool TimingChange;
+
     }
 
     internal enum TimeSignatures