h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 09:42:54 +08:00
Code Issues Releases Wiki Activity

Add sliders with backdrop blur

Browse Source
This commit is contained in:
Marvin Schürz 2024-10-19 00:55:01 +02:00
parent 00b2bdd0af
commit 851c46e6ca
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -37,6 +37,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
[Cached]
public DrawableSliderBall Ball { get; private set; }
public BackdropBlurContainer BlurContainer { get; private set; }
public SkinnableDrawable Body { get; private set; }
private ShakeContainer shakeContainer;
@ -106,7 +108,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
RelativeSizeAxes = Axes.Both,
Children = new[]
{
Body = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
BlurContainer = new BackdropBlurContainer
{
RelativeSizeAxes = Axes.Both,
BlurSigma = new Vector2(10f),
MaskCutoff = 0.25f,
EffectBufferScale = new Vector2(0.5f),
Child = Body = new SkinnableDrawable(new OsuSkinComponentLookup(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling)
},
// proxied here so that the tail is drawn under repeats/ticks - legacy skins rely on this
tailContainer.CreateProxy(),
tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
@ -282,6 +291,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
relativeAnchorPositionLayout.Validate();
}
BlurContainer.MaskCutoff = Body.Alpha * 0.25f;
}
public override void OnKilled()
@ -337,7 +348,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
base.UpdateInitialTransforms();
Body.FadeInFromZero(HitObject.TimeFadeIn);
// The backdrop blur opacity should fade in quicker, but the overall alpha should fade in linearly.
// By using OutQuad easing on both the blur container & the child, we end up getting a linear fade in.
BlurContainer.FadeInFromZero(HitObject.TimeFadeIn, Easing.OutQuad);
Body.FadeInFromZero(HitObject.TimeFadeIn, Easing.OutQuad);
}
protected override void UpdateStartTimeStateTransforms()
@ -358,7 +372,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
case ArmedState.Hit:
if (HeadCircle.IsHit && SliderBody?.SnakingOut.Value == true)
Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
BlurContainer.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
break;
}

1
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
View File

@ -74,6 +74,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Alpha = priorityLookupPrefix == null ? 0.75f : 0.5f // TODO: this is kind of a dirty way to check if we're a hitcircle or a circle that's part of a slider.
},
OverlayLayer = new Container
{

2
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
protected override Color4 GetBodyAccentColour(ISkinSource skin, Color4 hitObjectAccentColour)
{
// legacy skins use a constant value for slider track alpha, regardless of the source colour.
return base.GetBodyAccentColour(skin, hitObjectAccentColour).Opacity(0.7f);
return base.GetBodyAccentColour(skin, hitObjectAccentColour).Opacity(0.6f);
}
private partial class LegacyDrawableSliderPath : DrawableSliderPath

6
osu.Game/OsuGame.cs
View File

@ -994,7 +994,11 @@ namespace osu.Game
Children = new Drawable[]
{
backReceptor = new ScreenFooter.BackReceptor(),
ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
new RefCountedBackbufferProvider
{
RelativeSizeAxes = Axes.Both,
Child = ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both }
},
BackButton = new BackButton(backReceptor)
{
Anchor = Anchor.BottomLeft,