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

Add initial support for spinner disc skinning

Browse Source
This commit is contained in:
Dean Herbert
2020-07-29 16:25:10 +09:00
parent c3c60334ec
commit d01d1ce3f1
13 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -175,8 +175,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Background.AccentColour = normalColour;
Ticks.AccentColour = normalColour;
Disc.AccentColour = fillColour;
circle.Colour = colours.BlueDark;
glow.Colour = colours.BlueDark;

30
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -9,6 +9,7 @@ using osu.Game.Graphics;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Utils;
using osu.Game.Skinning;
namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
@ -16,13 +17,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
private readonly Spinner spinner;
private Color4 accentColour;
public Color4 AccentColour
{
get => background.AccentColour;
set => background.AccentColour = value;
get => accentColour;
set
{
accentColour = value;
if (background.Drawable is IHasAccentColour accent)
accent.AccentColour = value;
}
}
private readonly SpinnerBackground background;
private readonly SkinnableDrawable background;
private const float idle_alpha = 0.2f;
private const float tracking_alpha = 0.4f;
@ -37,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Children = new Drawable[]
{
background = new SpinnerBackground { Alpha = idle_alpha },
background = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerDisc), _ => new SpinnerBackground { Alpha = idle_alpha }),
};
}
@ -54,7 +62,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
tracking = value;
background.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
// todo: new default only
background.Drawable.FadeTo(tracking ? tracking_alpha : idle_alpha, 100);
}
}
@ -121,11 +130,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
if (Complete && updateCompleteTick())
{
background.FinishTransforms(false, nameof(Alpha));
background
.FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
.Then()
.FadeTo(tracking_alpha, 250, Easing.OutQuint);
// todo: new default only
background.Drawable.FinishTransforms(false, nameof(Alpha));
background.Drawable
.FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
.Then()
.FadeTo(tracking_alpha, 250, Easing.OutQuint);
}
Rotation = (float)Interpolation.Lerp(Rotation, currentRotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));