sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into progress-bar-show-seek

Browse Source
This commit is contained in:
Dean Herbert
2019-05-10 17:27:49 +09:00
committed by GitHub
parent fdf67aaa11 3860282ace
commit a44296a6db
7 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
@ -142,11 +143,11 @@ 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[]
{
frameStabilityContainer = new FrameStabilityContainer
frameStabilityContainer = new FrameStabilityContainer(GameplayStartTime)
{
Child = KeyBindingInputManager
.WithChild(CreatePlayfieldAdjustmentContainer()
@ -165,16 +166,24 @@ namespace osu.Game.Rulesets.UI
applyRulesetMods(mods, config);
loadObjects();
loadObjects(cancellationToken);
}
/// <summary>
/// Creates and adds drawable representations of hit objects to the play field.
/// </summary>
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();