h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-04 02:13:39 +08:00
Code Issues Releases Wiki Activity

Move beatmap offset write logic to a separate method

Browse Source 
Note that calling `writeOffsetToBeatmap` from `currentChanged` is still intentionally not
scheduled, see https://github.com/ppy/osu/pull/34612#discussion_r2269052138.

This commit is done so that if that call is scheduled, then the logic
above it that update the play graph and visibility state of the button
still don't get scheduled, otherwise the test will fail (as noticed in https://github.com/ppy/osu/pull/34612#discussion_r2269208998).
This commit is contained in:
Salman Alshamrani
2025-08-14 13:42:48 +03:00
Unverified
parent 69b6166e58
commit 1db49d250f
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+33 -33
View File
@@ -146,42 +146,42 @@ namespace osu.Game.Screens.Play.PlayerSettings
private void currentChanged(ValueChangedEvent<double> offset)
{
updateOffset();
// Negative is applied here because the play graph is considering a hit offset, not track (as we currently use for clocks).
lastPlayGraph?.UpdateOffset(-adjustmentSinceLastPlay);
void updateOffset()
// Calibration button may be hidden due to automatic offset adjustment, but it should be visible when the user manually adjusts their offset away from the applied suggestion.
calibrateFromLastPlayButton?.Show();
writeOffsetToBeatmap();
}
private void writeOffsetToBeatmap()
{
// ensure the previous write has completed. ignoring performance concerns, if we don't do this, the async writes could be out of sequence.
if (realmWriteTask?.IsCompleted == false)
{
// Negative is applied here because the play graph is considering a hit offset, not track (as we currently use for clocks).
lastPlayGraph?.UpdateOffset(-adjustmentSinceLastPlay);
// Calibration button may be hidden due to automatic offset adjustment, but it should be visible when the user manually adjusts their offset away from the applied suggestion.
calibrateFromLastPlayButton?.Show();
// ensure the previous write has completed. ignoring performance concerns, if we don't do this, the async writes could be out of sequence.
if (realmWriteTask?.IsCompleted == false)
{
Scheduler.AddOnce(updateOffset);
return;
}
realmWriteTask = realm.WriteAsync(r =>
{
var setInfo = r.Find<BeatmapSetInfo>(beatmap.Value.BeatmapSetInfo.ID);
if (setInfo == null) // only the case for tests.
return;
// Apply to all difficulties in a beatmap set if they have the same audio
// (they generally always share timing).
foreach (var b in setInfo.Beatmaps)
{
BeatmapUserSettings userSettings = b.UserSettings;
double val = Current.Value;
if (userSettings.Offset != val && b.AudioEquals(beatmap.Value.BeatmapInfo))
userSettings.Offset = val;
}
});
Scheduler.AddOnce(writeOffsetToBeatmap);
return;
}
realmWriteTask = realm.WriteAsync(r =>
{
var setInfo = r.Find<BeatmapSetInfo>(beatmap.Value.BeatmapSetInfo.ID);
if (setInfo == null) // only the case for tests.
return;
// Apply to all difficulties in a beatmap set if they have the same audio
// (they generally always share timing).
foreach (var b in setInfo.Beatmaps)
{
BeatmapUserSettings userSettings = b.UserSettings;
double val = Current.Value;
if (userSettings.Offset != val && b.AudioEquals(beatmap.Value.BeatmapInfo))
userSettings.Offset = val;
}
});
}
private void scoreChanged(ValueChangedEvent<ScoreInfo?> score)