sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Treat NaN slider velocity timing points as 1.0x but without slider ticks

Browse Source
This commit is contained in:
Khang
2022-08-22 21:44:25 -04:00
parent e8d4bc4497
commit 9f08c474ca
9 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -373,7 +373,9 @@ namespace osu.Game.Beatmaps.Formats
string[] split = line.Split(',');
double time = getOffsetTime(Parsing.ParseDouble(split[0].Trim()));
double beatLength = Parsing.ParseDouble(split[1].Trim());
double beatLength = Parsing.ParseDouble(split[1].Trim(), allowNaN: true);
// If beatLength is NaN, speedMultiplier should still be 1 because all comparisons against NaN are false.
double speedMultiplier = beatLength < 0 ? 100.0 / -beatLength : 1;
TimeSignature timeSignature = TimeSignature.SimpleQuadruple;
@ -412,6 +414,9 @@ namespace osu.Game.Beatmaps.Formats
if (timingChange)
{
if (double.IsNaN(beatLength))
throw new InvalidDataException("Beat length cannot be NaN in a timing control point");
var controlPoint = CreateTimingControlPoint();
controlPoint.BeatLength = beatLength;
@ -425,6 +430,7 @@ namespace osu.Game.Beatmaps.Formats
#pragma warning restore 618
{
SliderVelocity = speedMultiplier,
GenerateTicks = !double.IsNaN(beatLength),
}, timingChange);
var effectPoint = new EffectControlPoint