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

Preview visual settings at the “loading” screen

Browse Source
This commit is contained in:
TocoToucan
2018-02-09 00:06:24 +03:00
parent d437c1d7ec
commit a860dd7208
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,10 +262,7 @@ namespace osu.Game.Screens.Play
if (!loadedSuccessfully) if (!loadedSuccessfully)
return; return;
DimLevel.ValueChanged += _ => UpdateBackgroundElements(); ConfigureBackgroundUpdate();
BlurLevel.ValueChanged += _ => UpdateBackgroundElements();
ShowStoryboard.ValueChanged += _ => UpdateBackgroundElements();
UpdateBackgroundElements();
Content.Alpha = 0; Content.Alpha = 0;
Content Content

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

@ -46,6 +46,14 @@ namespace osu.Game.Screens.Play
UserAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset); UserAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
} }
protected void ConfigureBackgroundUpdate()
{
DimLevel.ValueChanged += _ => UpdateBackgroundElements();
BlurLevel.ValueChanged += _ => UpdateBackgroundElements();
ShowStoryboard.ValueChanged += _ => UpdateBackgroundElements();
UpdateBackgroundElements();
}
protected void UpdateBackgroundElements() protected void UpdateBackgroundElements()
{ {
if (!IsCurrentScreen) return; if (!IsCurrentScreen) return;
@ -60,7 +68,7 @@ namespace osu.Game.Screens.Play
var beatmap = Beatmap.Value; var beatmap = Beatmap.Value;
var storyboardVisible = ShowStoryboard && beatmap.Storyboard.HasDrawable; var storyboardVisible = ShowStoryboard && beatmap.Storyboard.HasDrawable;
StoryboardContainer StoryboardContainer?
.FadeColour(OsuColour.Gray(opacity), duration, Easing.OutQuint) .FadeColour(OsuColour.Gray(opacity), duration, Easing.OutQuint)
.FadeTo(storyboardVisible && opacity > 0 ? 1 : 0, duration, Easing.OutQuint); .FadeTo(storyboardVisible && opacity > 0 ? 1 : 0, duration, Easing.OutQuint);
@ -70,6 +78,9 @@ namespace osu.Game.Screens.Play
protected void InitializeStoryboard(bool asyncLoad) protected void InitializeStoryboard(bool asyncLoad)
{ {
if (StoryboardContainer == null)
return;
var beatmap = Beatmap.Value; var beatmap = Beatmap.Value;
Storyboard = beatmap.Storyboard.CreateDrawable(Beatmap.Value); Storyboard = beatmap.Storyboard.CreateDrawable(Beatmap.Value);

2
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play
{ {
base.OnEntering(last); base.OnEntering(last);
Background.FadeTo(0.4f, 250); ConfigureBackgroundUpdate();
Content.ScaleTo(0.7f); Content.ScaleTo(0.7f);