sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Load the storyboard asynchronously if it wasn't loaded with the beatmap.

Browse Source
This commit is contained in:
Damnae
2017-09-14 18:56:01 +02:00
parent 4a15762139
commit f5368505ab
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Play/Player.cs
View File

@ -209,8 +209,9 @@ namespace osu.Game.Screens.Play
scoreProcessor = RulesetContainer.CreateScoreProcessor();
storyboardReplacesBackground = beatmap.StoryboardReplacesBackground;
if (showStoryboard)
initializeStoryboard();
initializeStoryboard(false);
hudOverlay.BindProcessor(scoreProcessor);
hudOverlay.BindRulesetContainer(RulesetContainer);
@ -227,15 +228,15 @@ namespace osu.Game.Screens.Play
scoreProcessor.Failed += onFail;
}
private void initializeStoryboard()
private void initializeStoryboard(bool asyncLoad)
{
var beatmap = Beatmap.Value.Beatmap;
storyboardReplacesBackground = beatmap.StoryboardReplacesBackground;
storyboardContainer.Add(storyboard = beatmap.Storyboard.CreateDrawable());
storyboard = beatmap.Storyboard.CreateDrawable();
storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect;
storyboard.Masking = true;
storyboardContainer.Add(asyncLoad ? new AsyncLoadWrapper(storyboard) { RelativeSizeAxes = Axes.Both } : (Drawable)storyboard);
}
public void Restart()
@ -348,7 +349,7 @@ namespace osu.Game.Screens.Play
var opacity = 1 - (float)dimLevel;
if (showStoryboard && storyboard == null)
initializeStoryboard();
initializeStoryboard(true);
storyboard?.FadeColour(new Color4(opacity, opacity, opacity, 1), 800);
storyboard?.FadeTo(showStoryboard && opacity > 0 ? 1 : 0, 200);