h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 15:27:26 +08:00
Code Issues Releases Wiki Activity

Don't create drawables for hidden storyboards.

Browse Source
This commit is contained in:
Damnae 2017-09-14 16:50:10 +02:00
parent c8cdf6787e
commit 4a15762139
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,7 @@ namespace osu.Game.Screens.Play
#endregion
private Container storyboardContainer;
private DrawableStoryboard storyboard;
private bool storyboardReplacesBackground;
@ -152,14 +153,10 @@ namespace osu.Game.Screens.Play
Children = new Drawable[]
{
new Container
storyboardContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Clock = offsetClock,
Children = new Drawable[]
{
storyboard = beatmap.Storyboard.CreateDrawable(),
}
},
pauseContainer = new PauseContainer
{
@ -212,10 +209,8 @@ namespace osu.Game.Screens.Play
scoreProcessor = RulesetContainer.CreateScoreProcessor();
storyboardReplacesBackground = beatmap.StoryboardReplacesBackground;
storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect;
storyboard.Masking = true;
storyboard.Alpha = showStoryboard ? 1 : 0;
if (showStoryboard)
initializeStoryboard();
hudOverlay.BindProcessor(scoreProcessor);
hudOverlay.BindRulesetContainer(RulesetContainer);
@ -232,6 +227,17 @@ namespace osu.Game.Screens.Play
scoreProcessor.Failed += onFail;
}
private void initializeStoryboard()
{
var beatmap = Beatmap.Value.Beatmap;
storyboardReplacesBackground = beatmap.StoryboardReplacesBackground;
storyboardContainer.Add(storyboard = beatmap.Storyboard.CreateDrawable());
storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect;
storyboard.Masking = true;
}
public void Restart()
{
sampleRestart?.Play();
@ -340,10 +346,14 @@ namespace osu.Game.Screens.Play
private void updateBackgroundElements()
{
var opacity = 1 - (float)dimLevel;
storyboard.FadeColour(new Color4(opacity, opacity, opacity, 1), 800);
storyboard.FadeTo(!showStoryboard || opacity == 0 ? 0 : 1, 200);
Background?.FadeTo(showStoryboard && storyboardReplacesBackground ? 0 : opacity, 800, Easing.OutQuint);
if (showStoryboard && storyboard == null)
initializeStoryboard();
storyboard?.FadeColour(new Color4(opacity, opacity, opacity, 1), 800);
storyboard?.FadeTo(showStoryboard && opacity > 0 ? 1 : 0, 200);
Background?.FadeTo(!showStoryboard || !storyboardReplacesBackground ? opacity : 0, 800, Easing.OutQuint);
}
private void fadeOut()