diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 77d1e60b87..7f13c8e469 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Objects.Drawables;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading;
using osu.Framework.Bindables;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Input;
@@ -140,7 +141,7 @@ namespace osu.Game.Rulesets.UI
public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
[BackgroundDependencyLoader]
- private void load(OsuConfigManager config)
+ private void load(OsuConfigManager config, CancellationToken cancellationToken)
{
InternalChildren = new Drawable[]
{
@@ -163,16 +164,24 @@ namespace osu.Game.Rulesets.UI
applyRulesetMods(mods, config);
- loadObjects();
+ loadObjects(cancellationToken);
}
///
/// Creates and adds drawable representations of hit objects to the play field.
///
- private void loadObjects()
+ private void loadObjects(CancellationToken cancellationToken)
{
foreach (TObject h in Beatmap.HitObjects)
+ {
+ if (cancellationToken.IsCancellationRequested)
+ break;
+
addHitObject(h);
+ }
+
+ if (cancellationToken.IsCancellationRequested)
+ return;
Playfield.PostProcess();
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 1182cacfc1..6af9d4d7f9 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Threading;
using osuTK;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@@ -57,7 +58,7 @@ namespace osu.Game.Storyboards.Drawables
}
[BackgroundDependencyLoader(true)]
- private void load(FileStore fileStore, GameplayClock clock)
+ private void load(FileStore fileStore, GameplayClock clock, CancellationToken cancellationToken)
{
if (clock != null)
Clock = clock;
@@ -65,7 +66,12 @@ namespace osu.Game.Storyboards.Drawables
dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
foreach (var layer in Storyboard.Layers)
+ {
+ if (cancellationToken.IsCancellationRequested)
+ break;
+
Add(layer.CreateDrawable());
+ }
}
private void updateLayerVisibility()
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
index 106ebfaf5d..e82b0df4f4 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System.Threading;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@@ -24,10 +25,13 @@ namespace osu.Game.Storyboards.Drawables
}
[BackgroundDependencyLoader]
- private void load()
+ private void load(CancellationToken cancellationToken)
{
foreach (var element in Layer.Elements)
{
+ if (cancellationToken.IsCancellationRequested)
+ break;
+
if (element.IsDrawable)
AddInternal(element.CreateDrawable());
}