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

Move user dim logic into UserDimContainer instead

Browse Source
This commit is contained in:
David Zhao
2019-02-20 16:53:57 +09:00
parent 87717dcf9e
commit 1bd1b6b099
5 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@ using osu.Framework.Threading;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using osu.Game.Online.API;
@ -61,7 +60,6 @@ namespace osu.Game.Screens.Play
public CursorContainer Cursor => RulesetContainer.Cursor;
public bool ProvidingUserCursor => RulesetContainer?.Cursor != null && !RulesetContainer.HasReplayLoaded.Value;
protected float BackgroundOpacity => 1 - (float)DimLevel;
private IAdjustableClock sourceClock;
@ -88,7 +86,7 @@ namespace osu.Game.Screens.Play
private FailOverlay failOverlay;
private DrawableStoryboard storyboard;
private Container storyboardContainer;
private UserDimContainer storyboardContainer;
public bool LoadedBeatmapSuccessfully => RulesetContainer?.Objects.Any() == true;
@ -175,9 +173,9 @@ namespace osu.Game.Screens.Play
OnRetry = Restart,
OnQuit = performUserRequestedExit,
CheckCanPause = () => AllowPause && ValidForResume && !HasFailed && !RulesetContainer.HasReplayLoaded,
Children = new[]
Children = new Container[]
{
storyboardContainer = new Container
storyboardContainer = new UserDimContainer
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
@ -242,6 +240,8 @@ namespace osu.Game.Screens.Play
if (ShowStoryboard)
initializeStoryboard(false);
storyboardContainer.EnableUserDim.Value = true;
// Bind ScoreProcessor to ourselves
ScoreProcessor.AllJudged += onCompletion;
ScoreProcessor.Failed += onFail;
@ -346,7 +346,7 @@ namespace osu.Game.Screens.Play
.Delay(250)
.FadeIn(250);
Background.UpdateDim.Value = true;
Background.EnableUserDim.Value = true;
Task.Run(() =>
{
@ -407,7 +407,7 @@ namespace osu.Game.Screens.Play
{
float fadeOutDuration = instant ? 0 : 250;
this.FadeOut(fadeOutDuration);
Background.UpdateDim.Value = false;
Background.EnableUserDim.Value = false;
}
protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;
@ -440,9 +440,7 @@ namespace osu.Game.Screens.Play
var beatmap = Beatmap.Value;
var storyboardVisible = ShowStoryboard && beatmap.Storyboard.HasDrawable;
storyboardContainer?
.FadeColour(OsuColour.Gray(BackgroundOpacity), BACKGROUND_FADE_DURATION, Easing.OutQuint)
.FadeTo(storyboardVisible && BackgroundOpacity > 0 ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
storyboardContainer?.FadeTo(storyboardVisible && 1 - (float)DimLevel > 0 ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
if (storyboardVisible && beatmap.Storyboard.ReplacesBackground)
Background?.FadeColour(Color4.Black, BACKGROUND_FADE_DURATION, Easing.OutQuint);