RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-27 01:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update decoder to also extract DifficultyControlPoints from HitObjects

Browse Source
This commit is contained in:
Dean Herbert 2021-08-31 16:34:31 +09:00
parent 071c56e90b
commit 4eb09ea1a9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
View File

@ -182,11 +182,19 @@ namespace osu.Game.Beatmaps.Formats
beatmap.ControlPointInfo = legacyControlPoints; beatmap.ControlPointInfo = legacyControlPoints;
SampleControlPoint lastRelevantSamplePoint = null; SampleControlPoint lastRelevantSamplePoint = null;
DifficultyControlPoint lastRelevantDifficultyPoint = null;
// iterate over hitobjects and pull out all required sample changes // iterate over hitobjects and pull out all required sample changes
foreach (var h in beatmap.HitObjects) foreach (var h in beatmap.HitObjects)
{ {
var hSamplePoint = h.SampleControlPoint; var hSamplePoint = h.SampleControlPoint;
var hDifficultyPoint = h.DifficultyControlPoint;
if (!hDifficultyPoint.IsRedundant(lastRelevantDifficultyPoint))
{
legacyControlPoints.Add(hDifficultyPoint.Time, hDifficultyPoint);
lastRelevantDifficultyPoint = hDifficultyPoint;
}
if (!hSamplePoint.IsRedundant(lastRelevantSamplePoint)) if (!hSamplePoint.IsRedundant(lastRelevantSamplePoint))
{ {
@ -209,7 +217,7 @@ namespace osu.Game.Beatmaps.Formats
} }
// Output any remaining effects as secondary non-timing control point. // Output any remaining effects as secondary non-timing control point.
var difficultyPoint = beatmap.ControlPointInfo.DifficultyPointAt(group.Time); var difficultyPoint = ((LegacyControlPointInfo)beatmap.ControlPointInfo).DifficultyPointAt(group.Time);
writer.Write(FormattableString.Invariant($"{group.Time},")); writer.Write(FormattableString.Invariant($"{group.Time},"));
writer.Write(FormattableString.Invariant($"{-100 / difficultyPoint.SpeedMultiplier},")); writer.Write(FormattableString.Invariant($"{-100 / difficultyPoint.SpeedMultiplier},"));
outputControlPointAt(group.Time, false); outputControlPointAt(group.Time, false);