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

Override add instead

Browse Source
This commit is contained in:
David Zhao
2019-03-20 14:55:52 +09:00
parent 9964644683
commit 86658e357b
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Graphics/Containers/UserDimContainer.cs
View File

@ -55,8 +55,6 @@ namespace osu.Game.Graphics.Containers
? new Vector2(BlurAmount.Value + (float)blurLevel.Value * 25) ? new Vector2(BlurAmount.Value + (float)blurLevel.Value * 25)
: new Vector2(BlurAmount.Value); : new Vector2(BlurAmount.Value);
private Background background => DimContainer.Children.OfType<Background>().FirstOrDefault();
/// <summary> /// <summary>
/// Creates a new <see cref="UserDimContainer"/>. /// Creates a new <see cref="UserDimContainer"/>.
/// </summary> /// </summary>
@ -72,15 +70,13 @@ namespace osu.Game.Graphics.Containers
AddInternal(DimContainer = new Container { RelativeSizeAxes = Axes.Both }); AddInternal(DimContainer = new Container { RelativeSizeAxes = Axes.Both });
} }
/// <summary> public override void Add(Drawable drawable)
/// Set the blur of the background in this UserDimContainer to our blur target instantly.
/// </summary>
/// <remarks>
/// We need to support instant blurring here in the case of changing beatmap backgrounds, where blurring shouldn't be from 0 every time the beatmap is changed.
/// </remarks>
public void ApplyInstantBlur()
{ {
background?.BlurTo(blurTarget, 0, Easing.OutQuint); // We need to blur instantly here in the case of changing beatmap backgrounds, where blurring shouldn't be from 0 every time the beatmap is changed.
if (drawable is Background b)
b.BlurTo(blurTarget, 0, Easing.OutQuint);
base.Add(drawable);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -114,10 +110,10 @@ namespace osu.Game.Graphics.Containers
// The background needs to be hidden in the case of it being replaced by the storyboard // The background needs to be hidden in the case of it being replaced by the storyboard
DimContainer.FadeTo(showStoryboard.Value && StoryboardReplacesBackground.Value ? 0 : 1, background_fade_duration, Easing.OutQuint); DimContainer.FadeTo(showStoryboard.Value && StoryboardReplacesBackground.Value ? 0 : 1, background_fade_duration, Easing.OutQuint);
// Only blur if this container contains a background // This only works if the background is a direct child of DimContainer.
// We can't blur the container like we did with the dim because buffered containers add considerable draw overhead. // We can't blur the container like we did with the dim because buffered containers add considerable draw overhead.
// As a result, this blurs the background directly. // As a result, this blurs the background directly via the direct children of DimContainer.
background?.BlurTo(blurTarget, background_fade_duration, Easing.OutQuint); DimContainer.Children.OfType<Background>().FirstOrDefault()?.BlurTo(blurTarget, background_fade_duration, Easing.OutQuint);
} }
DimContainer.FadeColour(EnableUserDim.Value ? OsuColour.Gray(1 - (float)dimLevel.Value) : Color4.White, background_fade_duration, Easing.OutQuint); DimContainer.FadeColour(EnableUserDim.Value ? OsuColour.Gray(1 - (float)dimLevel.Value) : Color4.White, background_fade_duration, Easing.OutQuint);

1
osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
View File

@ -86,7 +86,6 @@ namespace osu.Game.Screens.Backgrounds
b.Depth = newDepth; b.Depth = newDepth;
fadeContainer.Add(Background = b); fadeContainer.Add(Background = b);
fadeContainer.ApplyInstantBlur();
StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground); StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground);
} }