h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 11:33:22 +08:00
Code Issues Releases Wiki Activity

Remove SmoothCircularProgress usage in AccuracyCircle

Browse Source
This commit is contained in:
Andrei Zavatski 2022-12-03 16:39:44 +03:00
parent 94cfcdb338
commit 97b6d88f00
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -79,8 +80,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
private readonly ScoreInfo score; private readonly ScoreInfo score;
private SmoothCircularProgress accuracyCircle; private CircularProgress accuracyCircle;
private SmoothCircularProgress innerMask; private CircularProgress innerMask;
private Container<RankBadge> badges; private Container<RankBadge> badges;
private RankText rankText; private RankText rankText;
@ -109,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new SmoothCircularProgress new CircularProgress
{ {
Name = "Background circle", Name = "Background circle",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -120,7 +121,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
InnerRadius = accuracy_circle_radius + 0.01f, // Extends a little bit into the circle InnerRadius = accuracy_circle_radius + 0.01f, // Extends a little bit into the circle
Current = { Value = 1 }, Current = { Value = 1 },
}, },
accuracyCircle = new SmoothCircularProgress accuracyCircle = new CircularProgress
{ {
Name = "Accuracy circle", Name = "Accuracy circle",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -139,42 +140,42 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
Padding = new MarginPadding(2), Padding = new MarginPadding(2),
Children = new Drawable[] Children = new Drawable[]
{ {
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.X), Colour = OsuColour.ForRank(ScoreRank.X),
InnerRadius = RANK_CIRCLE_RADIUS, InnerRadius = RANK_CIRCLE_RADIUS,
Current = { Value = 1 } Current = { Value = 1 }
}, },
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.S), Colour = OsuColour.ForRank(ScoreRank.S),
InnerRadius = RANK_CIRCLE_RADIUS, InnerRadius = RANK_CIRCLE_RADIUS,
Current = { Value = 1 - virtual_ss_percentage } Current = { Value = 1 - virtual_ss_percentage }
}, },
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.A), Colour = OsuColour.ForRank(ScoreRank.A),
InnerRadius = RANK_CIRCLE_RADIUS, InnerRadius = RANK_CIRCLE_RADIUS,
Current = { Value = 0.95f } Current = { Value = 0.95f }
}, },
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.B), Colour = OsuColour.ForRank(ScoreRank.B),
InnerRadius = RANK_CIRCLE_RADIUS, InnerRadius = RANK_CIRCLE_RADIUS,
Current = { Value = 0.9f } Current = { Value = 0.9f }
}, },
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.C), Colour = OsuColour.ForRank(ScoreRank.C),
InnerRadius = RANK_CIRCLE_RADIUS, InnerRadius = RANK_CIRCLE_RADIUS,
Current = { Value = 0.8f } Current = { Value = 0.8f }
}, },
new SmoothCircularProgress new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.ForRank(ScoreRank.D), Colour = OsuColour.ForRank(ScoreRank.D),
@ -195,14 +196,14 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
Blending = new BlendingParameters Blending = new BlendingParameters
{ {
Source = BlendingType.DstColor, Source = BlendingType.DstColor,
Destination = BlendingType.OneMinusSrcAlpha, Destination = BlendingType.OneMinusSrcColor,
SourceAlpha = BlendingType.One, SourceAlpha = BlendingType.One,
DestinationAlpha = BlendingType.SrcAlpha DestinationAlpha = BlendingType.SrcAlpha
}, },
Child = innerMask = new SmoothCircularProgress Child = innerMask = new CircularProgress
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
InnerRadius = RANK_CIRCLE_RADIUS - 0.01f, InnerRadius = RANK_CIRCLE_RADIUS - 0.02f,
} }
} }
} }