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

Add cancellation to storyboard/hitobject loading

Browse Source
This commit is contained in:
smoogipoo 2019-05-10 16:31:09 +09:00
parent 5fa721fdab
commit d25d39b315
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -12,6 +12,7 @@ using osu.Game.Rulesets.Objects.Drawables;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Input; using osu.Framework.Input;
@ -140,7 +141,7 @@ namespace osu.Game.Rulesets.UI
public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer(); public virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config, CancellationToken cancellationToken)
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -163,16 +164,24 @@ namespace osu.Game.Rulesets.UI
applyRulesetMods(mods, config); applyRulesetMods(mods, config);
loadObjects(); loadObjects(cancellationToken);
} }
/// <summary> /// <summary>
/// Creates and adds drawable representations of hit objects to the play field. /// Creates and adds drawable representations of hit objects to the play field.
/// </summary> /// </summary>
private void loadObjects() private void loadObjects(CancellationToken cancellationToken)
{ {
foreach (TObject h in Beatmap.HitObjects) foreach (TObject h in Beatmap.HitObjects)
{
if (cancellationToken.IsCancellationRequested)
break;
addHitObject(h); addHitObject(h);
}
if (cancellationToken.IsCancellationRequested)
return;
Playfield.PostProcess(); Playfield.PostProcess();

8
osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
View File

@ -1,6 +1,7 @@
// 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.
using System.Threading;
using osuTK; using osuTK;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -57,7 +58,7 @@ namespace osu.Game.Storyboards.Drawables
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(FileStore fileStore, GameplayClock clock) private void load(FileStore fileStore, GameplayClock clock, CancellationToken cancellationToken)
{ {
if (clock != null) if (clock != null)
Clock = clock; Clock = clock;
@ -65,7 +66,12 @@ namespace osu.Game.Storyboards.Drawables
dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1)); dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
foreach (var layer in Storyboard.Layers) foreach (var layer in Storyboard.Layers)
{
if (cancellationToken.IsCancellationRequested)
break;
Add(layer.CreateDrawable()); Add(layer.CreateDrawable());
}
} }
private void updateLayerVisibility() private void updateLayerVisibility()

6
osu.Game/Storyboards/Drawables/DrawableStoryboardLayer.cs
View File

@ -1,6 +1,7 @@
// 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.
using System.Threading;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -24,10 +25,13 @@ namespace osu.Game.Storyboards.Drawables
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load(CancellationToken cancellationToken)
{ {
foreach (var element in Layer.Elements) foreach (var element in Layer.Elements)
{ {
if (cancellationToken.IsCancellationRequested)
break;
if (element.IsDrawable) if (element.IsDrawable)
AddInternal(element.CreateDrawable()); AddInternal(element.CreateDrawable());
} }