h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 16:03:01 +08:00
Code Issues Releases Wiki Activity

Better property name.

Browse Source
This commit is contained in:
Damnae 2017-09-14 16:26:18 +02:00
parent 7c3ce7e830
commit c8cdf6787e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Beatmap.cs
View File

@ -47,9 +47,9 @@ namespace osu.Game.Beatmaps
public Storyboard Storyboard = new Storyboard(); public Storyboard Storyboard = new Storyboard();
/// <summary> /// <summary>
/// Whether this beatmap's Storyboard uses the background texture in its Background layer. /// Whether this beatmap's background should be hidden while its storyboard is being displayed.
/// </summary> /// </summary>
public bool StoryboardUsesBackground public bool StoryboardReplacesBackground
{ {
get get
{ {

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

@ -70,7 +70,7 @@ namespace osu.Game.Screens.Play
#endregion #endregion
private DrawableStoryboard storyboard; private DrawableStoryboard storyboard;
private bool storyboardUsesBackground; private bool storyboardReplacesBackground;
private HUDOverlay hudOverlay; private HUDOverlay hudOverlay;
private FailOverlay failOverlay; private FailOverlay failOverlay;
@ -212,7 +212,7 @@ namespace osu.Game.Screens.Play
scoreProcessor = RulesetContainer.CreateScoreProcessor(); scoreProcessor = RulesetContainer.CreateScoreProcessor();
storyboardUsesBackground = beatmap.StoryboardUsesBackground; storyboardReplacesBackground = beatmap.StoryboardReplacesBackground;
storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect; storyboard.Width = storyboard.Height * beatmap.BeatmapInfo.StoryboardAspect;
storyboard.Masking = true; storyboard.Masking = true;
storyboard.Alpha = showStoryboard ? 1 : 0; storyboard.Alpha = showStoryboard ? 1 : 0;
@ -341,9 +341,9 @@ namespace osu.Game.Screens.Play
{ {
var opacity = 1 - (float)dimLevel; var opacity = 1 - (float)dimLevel;
storyboard.FadeColour(new Color4(opacity, opacity, opacity, 1), 800); storyboard.FadeColour(new Color4(opacity, opacity, opacity, 1), 800);
storyboard.FadeTo(!showStoryboard || opacity == 0 ? 0 : 1, 800); storyboard.FadeTo(!showStoryboard || opacity == 0 ? 0 : 1, 200);
Background?.FadeTo(showStoryboard && storyboardUsesBackground ? 0 : opacity, 800, Easing.OutQuint); Background?.FadeTo(showStoryboard && storyboardReplacesBackground ? 0 : opacity, 800, Easing.OutQuint);
} }
private void fadeOut() private void fadeOut()