h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 11:43:01 +08:00
Code Issues Releases Wiki Activity

Merge pull request #22532 from peppy/fix-long-storyboard-outro

Browse Source 
Fix storyboard outro time potentially running too long
This commit is contained in:
Bartłomiej Dach 2023-02-06 20:30:36 +01:00 committed by GitHub
commit 12f6d461b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
View File

@ -214,7 +214,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
Assert.That(oneTime.EndTime, Is.EqualTo(4000 + loop_duration)); Assert.That(oneTime.EndTime, Is.EqualTo(4000 + loop_duration));
StoryboardSprite manyTimes = background.Elements.OfType<StoryboardSprite>().Single(s => s.Path == "many-times.png"); StoryboardSprite manyTimes = background.Elements.OfType<StoryboardSprite>().Single(s => s.Path == "many-times.png");
Assert.That(manyTimes.EndTime, Is.EqualTo(9000 + 40 * loop_duration)); // It is intentional that we don't consider the loop count (40) as part of the end time calculation to match stable's handling.
// If we were to include the loop count, storyboards which loop for stupid long loop counts would continue playing the outro forever.
Assert.That(manyTimes.EndTime, Is.EqualTo(9000 + loop_duration));
} }
} }
} }

7
osu.Game/Storyboards/CommandLoop.cs
View File

@ -18,7 +18,12 @@ namespace osu.Game.Storyboards
public readonly int TotalIterations; public readonly int TotalIterations;
public override double StartTime => LoopStartTime + CommandsStartTime; public override double StartTime => LoopStartTime + CommandsStartTime;
public override double EndTime => StartTime + CommandsDuration * TotalIterations;
public override double EndTime =>
// In an ideal world, we would multiply the command duration by TotalIterations here.
// Unfortunately this would clash with how stable handled end times, and results in some storyboards playing outro
// sequences for minutes or hours.
StartTime + CommandsDuration;
/// <summary> /// <summary>
/// Construct a new command loop. /// Construct a new command loop.

3
osu.Game/Storyboards/CommandTimelineGroup.cs
View File

@ -84,9 +84,6 @@ namespace osu.Game.Storyboards
[JsonIgnore] [JsonIgnore]
public virtual double EndTime => CommandsEndTime; public virtual double EndTime => CommandsEndTime;
[JsonIgnore]
public double Duration => EndTime - StartTime;
[JsonIgnore] [JsonIgnore]
public bool HasCommands public bool HasCommands
{ {