h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:42:55 +08:00
Code Issues Releases Wiki Activity

Split out default and sample application

Browse Source
This commit is contained in:
Dean Herbert 2023-05-03 13:30:45 +09:00
parent cca15f930c
commit 48fd99818e
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,20 +95,14 @@ namespace osu.Game.Beatmaps.Formats
foreach (var hitObject in this.beatmap.HitObjects) foreach (var hitObject in this.beatmap.HitObjects)
{ {
applyLegacyInfoAndDefaults(hitObject); applyDefaults(hitObject);
applySamples(hitObject);
} }
} }
private void applyLegacyInfoAndDefaults(HitObject hitObject) private void applyDefaults(HitObject hitObject)
{ {
DifficultyControlPoint difficultyControlPoint = DifficultyControlPoint.DEFAULT; DifficultyControlPoint difficultyControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.DifficultyPointAt(hitObject.StartTime) ?? DifficultyControlPoint.DEFAULT;
SampleControlPoint sampleControlPoint = SampleControlPoint.DEFAULT;
if (beatmap.ControlPointInfo is LegacyControlPointInfo legacyInfo)
{
difficultyControlPoint = legacyInfo.DifficultyPointAt(hitObject.StartTime);
sampleControlPoint = legacyInfo.SamplePointAt(hitObject.GetEndTime() + control_point_leniency);
}
if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint) if (difficultyControlPoint is LegacyDifficultyControlPoint legacyDifficultyControlPoint)
{ {
@ -121,6 +115,11 @@ namespace osu.Game.Beatmaps.Formats
hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity; hasSliderVelocity.SliderVelocity = difficultyControlPoint.SliderVelocity;
hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty); hitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.Difficulty);
}
private void applySamples(HitObject hitObject)
{
SampleControlPoint sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(hitObject.GetEndTime() + control_point_leniency) ?? SampleControlPoint.DEFAULT;
hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList(); hitObject.Samples = hitObject.Samples.Select(o => sampleControlPoint.ApplyTo(o)).ToList();
@ -129,9 +128,9 @@ namespace osu.Game.Beatmaps.Formats
for (int i = 0; i < hasRepeats.NodeSamples.Count; i++) for (int i = 0; i < hasRepeats.NodeSamples.Count; i++)
{ {
double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency; double time = hitObject.StartTime + i * hasRepeats.Duration / hasRepeats.SpanCount() + control_point_leniency;
sampleControlPoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT; var nodeSamplePoint = (beatmap.ControlPointInfo as LegacyControlPointInfo)?.SamplePointAt(time) ?? SampleControlPoint.DEFAULT;
hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => sampleControlPoint.ApplyTo(o)).ToList(); hasRepeats.NodeSamples[i] = hasRepeats.NodeSamples[i].Select(o => nodeSamplePoint.ApplyTo(o)).ToList();
} }
} }
} }