h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #20173 from peppy/test-scene-storyboard-tidy

Browse Source 
Tidy up `TestSceneStoryboard`
This commit is contained in:
Dan Balasescu 2022-09-07 17:07:19 +09:00 committed by GitHub
commit 264c9bfaf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -24,8 +22,9 @@ namespace osu.Game.Tests.Visual.Gameplay
[TestFixture] [TestFixture]
public class TestSceneStoryboard : OsuTestScene public class TestSceneStoryboard : OsuTestScene
{ {
private Container<DrawableStoryboard> storyboardContainer; private Container<DrawableStoryboard> storyboardContainer = null!;
private DrawableStoryboard storyboard;
private DrawableStoryboard? storyboard;
[Test] [Test]
public void TestStoryboard() public void TestStoryboard()
@ -40,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test] [Test]
public void TestStoryboardMissingVideo() public void TestStoryboardMissingVideo()
{ {
AddStep("Load storyboard with missing video", loadStoryboardNoVideo); AddStep("Load storyboard with missing video", () => loadStoryboard("storyboard_no_video.osu"));
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -77,18 +76,18 @@ namespace osu.Game.Tests.Visual.Gameplay
Beatmap.BindValueChanged(beatmapChanged, true); Beatmap.BindValueChanged(beatmapChanged, true);
} }
private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e) => loadStoryboard(e.NewValue); private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e) => loadStoryboard(e.NewValue.Storyboard);
private void restart() private void restart()
{ {
var track = Beatmap.Value.Track; var track = Beatmap.Value.Track;
track.Reset(); track.Reset();
loadStoryboard(Beatmap.Value); loadStoryboard(Beatmap.Value.Storyboard);
track.Start(); track.Start();
} }
private void loadStoryboard(IWorkingBeatmap working) private void loadStoryboard(Storyboard toLoad)
{ {
if (storyboard != null) if (storyboard != null)
storyboardContainer.Remove(storyboard, true); storyboardContainer.Remove(storyboard, true);
@ -96,34 +95,25 @@ namespace osu.Game.Tests.Visual.Gameplay
var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true }; var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
storyboardContainer.Clock = decoupledClock; storyboardContainer.Clock = decoupledClock;
storyboard = working.Storyboard.CreateDrawable(SelectedMods.Value); storyboard = toLoad.CreateDrawable(SelectedMods.Value);
storyboard.Passing = false; storyboard.Passing = false;
storyboardContainer.Add(storyboard);
decoupledClock.ChangeSource(working.Track);
}
private void loadStoryboardNoVideo()
{
if (storyboard != null)
storyboardContainer.Remove(storyboard, true);
var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
storyboardContainer.Clock = decoupledClock;
Storyboard sb;
using (var str = TestResources.OpenResource("storyboard_no_video.osu"))
using (var bfr = new LineBufferedReader(str))
{
var decoder = new LegacyStoryboardDecoder();
sb = decoder.Decode(bfr);
}
storyboard = sb.CreateDrawable(SelectedMods.Value);
storyboardContainer.Add(storyboard); storyboardContainer.Add(storyboard);
decoupledClock.ChangeSource(Beatmap.Value.Track); decoupledClock.ChangeSource(Beatmap.Value.Track);
} }
private void loadStoryboard(string filename)
{
Storyboard loaded;
using (var str = TestResources.OpenResource(filename))
using (var bfr = new LineBufferedReader(str))
{
var decoder = new LegacyStoryboardDecoder();
loaded = decoder.Decode(bfr);
}
loadStoryboard(loaded);
}
} }
} }