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

Add glow

Browse Source
This commit is contained in:
Dean Herbert 2022-06-01 20:04:44 +09:00
parent c3ba7b2c3b
commit 3c7a04256f
1 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
osu.Game/Screens/Edit/Timing/TapButton.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
@ -32,6 +33,8 @@ namespace osu.Game.Screens.Edit.Timing
private Container scaleContainer; private Container scaleContainer;
private Container lights; private Container lights;
private Container lightsGlow;
private OsuSpriteText text;
private const int light_count = 6; private const int light_count = 6;
@ -79,11 +82,16 @@ namespace osu.Game.Screens.Edit.Timing
}, },
new Circle new Circle
{ {
Name = "inner masking",
Size = new Vector2(SIZE - ring_width * 2 + light_padding * 2), Size = new Vector2(SIZE - ring_width * 2 + light_padding * 2),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = colourProvider.Background3, Colour = colourProvider.Background3,
}, },
lightsGlow = new Container
{
RelativeSizeAxes = Axes.Both,
},
innerCircle = new CircularContainer innerCircle = new CircularContainer
{ {
Size = new Vector2(SIZE - ring_width * 2), Size = new Vector2(SIZE - ring_width * 2),
@ -104,7 +112,7 @@ namespace osu.Game.Screens.Edit.Timing
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = 0, Alpha = 0,
}, },
new OsuSpriteText text = new OsuSpriteText
{ {
Font = OsuFont.Torus.With(size: 20), Font = OsuFont.Torus.With(size: 20),
Colour = colourProvider.Background1, Colour = colourProvider.Background1,
@ -126,10 +134,13 @@ namespace osu.Game.Screens.Edit.Timing
for (int i = 0; i < light_count; i++) for (int i = 0; i < light_count; i++)
{ {
lights.Add(new Light var light = new Light
{ {
Rotation = i * (360f / light_count) Rotation = i * (360f / light_count)
}); };
lights.Add(light);
lightsGlow.Add(light.Glow.CreateProxy());
} }
} }
@ -152,6 +163,8 @@ namespace osu.Game.Screens.Edit.Timing
{ {
const double in_duration = 100; const double in_duration = 100;
text.FadeColour(colourProvider.Background4, in_duration, Easing.OutQuint);
scaleContainer.ScaleTo(0.99f, in_duration, Easing.OutQuint); scaleContainer.ScaleTo(0.99f, in_duration, Easing.OutQuint);
innerCircle.ScaleTo(0.96f, in_duration, Easing.OutQuint); innerCircle.ScaleTo(0.96f, in_duration, Easing.OutQuint);
@ -174,6 +187,8 @@ namespace osu.Game.Screens.Edit.Timing
{ {
const double out_duration = 800; const double out_duration = 800;
text.FadeColour(colourProvider.Background1, out_duration, Easing.OutQuint);
scaleContainer.ScaleTo(1, out_duration, Easing.OutQuint); scaleContainer.ScaleTo(1, out_duration, Easing.OutQuint);
innerCircle.ScaleTo(1, out_duration, Easing.OutQuint); innerCircle.ScaleTo(1, out_duration, Easing.OutQuint);
innerCircleHighlight.FadeOut(out_duration, Easing.OutQuint); innerCircleHighlight.FadeOut(out_duration, Easing.OutQuint);
@ -182,7 +197,9 @@ namespace osu.Game.Screens.Edit.Timing
private class Light : CompositeDrawable private class Light : CompositeDrawable
{ {
private CircularProgress fill; public Drawable Glow { get; private set; }
private Container fillContent;
[Resolved] [Resolved]
private OverlayColourProvider colourProvider { get; set; } private OverlayColourProvider colourProvider { get; set; }
@ -194,41 +211,56 @@ namespace osu.Game.Screens.Edit.Timing
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Size = new Vector2(0.98f); // Avoid bleed into masking edge.
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new CircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(0.99f),
Current = { Value = 1f / light_count - 0.01f }, Current = { Value = 1f / light_count - 0.01f },
Colour = colourProvider.Background2, Colour = colourProvider.Background2,
}, },
fill = new CircularProgress fillContent = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Alpha = 0, Alpha = 0,
Size = new Vector2(0.99f),
Current = { Value = 1f / light_count - 0.01f },
Colour = colourProvider.Colour1, Colour = colourProvider.Colour1,
Children = new[]
{
new CircularProgress
{
RelativeSizeAxes = Axes.Both,
Current = { Value = 1f / light_count - 0.01f },
Blending = BlendingParameters.Additive Blending = BlendingParameters.Additive
}, },
Glow = new CircularProgress
{
RelativeSizeAxes = Axes.Both,
Current = { Value = 1f / light_count - 0.01f },
Blending = BlendingParameters.Additive
}.WithEffect(new GlowEffect
{
Colour = colourProvider.Colour1.Opacity(0.4f),
BlurSigma = new Vector2(9f),
Strength = 10,
PadExtent = true
}),
}
},
}; };
} }
public override void Show() public override void Show()
{ {
fill fillContent
.FadeIn(50, Easing.OutQuint) .FadeIn(50, Easing.OutQuint)
.FlashColour(Color4.White, 1000, Easing.OutQuint); .FlashColour(Color4.White, 1000, Easing.OutQuint);
} }
public override void Hide() public override void Hide()
{ {
fill fillContent
.FadeOut(300, Easing.OutQuint); .FadeOut(300, Easing.OutQuint);
} }
} }