h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 17:52:56 +08:00
Code Issues Releases Wiki Activity

Ensure time of HitObject related ControlPoints are kept in sync with the hitobject

Browse Source
This commit is contained in:
Dean Herbert 2021-09-10 15:57:11 +09:00
parent 714f55b6bc
commit cd227213e6
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -94,6 +94,12 @@ namespace osu.Game.Rulesets.Objects
foreach (var nested in NestedHitObjects) foreach (var nested in NestedHitObjects)
nested.StartTime += offset; nested.StartTime += offset;
if (DifficultyControlPoint != DifficultyControlPoint.DEFAULT)
DifficultyControlPoint.Time = time.NewValue;
// traditionally this used EndTime, but at the point changes are being made in the editor this should no longer be considered relevant.
if (SampleControlPoint != SampleControlPoint.DEFAULT)
SampleControlPoint.Time = time.NewValue;
}; };
} }
@ -108,13 +114,19 @@ namespace osu.Game.Rulesets.Objects
var legacyInfo = controlPointInfo as LegacyControlPointInfo; var legacyInfo = controlPointInfo as LegacyControlPointInfo;
if (legacyInfo != null) if (legacyInfo != null)
{
DifficultyControlPoint = (DifficultyControlPoint)legacyInfo.DifficultyPointAt(StartTime).DeepClone(); DifficultyControlPoint = (DifficultyControlPoint)legacyInfo.DifficultyPointAt(StartTime).DeepClone();
DifficultyControlPoint.Time = StartTime;
}
ApplyDefaultsToSelf(controlPointInfo, difficulty); ApplyDefaultsToSelf(controlPointInfo, difficulty);
// This is done here after ApplyDefaultsToSelf as we may require custom defaults to be applied to have an accurate end time. // This is done here after ApplyDefaultsToSelf as we may require custom defaults to be applied to have an accurate end time.
if (legacyInfo != null) if (legacyInfo != null)
{
SampleControlPoint = (SampleControlPoint)legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency).DeepClone(); SampleControlPoint = (SampleControlPoint)legacyInfo.SamplePointAt(this.GetEndTime() + control_point_leniency).DeepClone();
SampleControlPoint.Time = this.GetEndTime() + control_point_leniency;
}
nestedHitObjects.Clear(); nestedHitObjects.Clear();