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

Move ApproachCircle out of the scale container and revert relevant changes

Browse Source
This commit is contained in:
Salman Ahmed
2021-06-21 10:47:38 +03:00
parent 036b745425
commit ba15f7c19b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
View File

@ -38,6 +38,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
AddInternal(scaleContainer = new Container AddInternal(scaleContainer = new Container
{ {
Scale = new Vector2(SPRITE_SCALE),
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -49,7 +50,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-glow"), Texture = source.GetTexture("spinner-glow"),
Scale = new Vector2(SPRITE_SCALE),
Blending = BlendingParameters.Additive, Blending = BlendingParameters.Additive,
Colour = glowColour, Colour = glowColour,
}, },
@ -58,40 +58,37 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-bottom"), Texture = source.GetTexture("spinner-bottom"),
Scale = new Vector2(SPRITE_SCALE),
}, },
discTop = new Sprite discTop = new Sprite
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-top"), Texture = source.GetTexture("spinner-top"),
Scale = new Vector2(SPRITE_SCALE),
}, },
fixedMiddle = new Sprite fixedMiddle = new Sprite
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-middle"), Texture = source.GetTexture("spinner-middle"),
Scale = new Vector2(SPRITE_SCALE),
}, },
spinningMiddle = new Sprite spinningMiddle = new Sprite
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-middle2"), Texture = source.GetTexture("spinner-middle2"),
Scale = new Vector2(SPRITE_SCALE),
}, },
} }
}); });
if (!(source.FindProvider(s => s.GetTexture("spinner-top") != null) is DefaultLegacySkin)) if (!(source.FindProvider(s => s.GetTexture("spinner-top") != null) is DefaultLegacySkin))
{ {
scaleContainer.Add(ApproachCircle = new Sprite AddInternal(ApproachCircle = new Sprite
{ {
Anchor = Anchor.Centre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Texture = source.GetTexture("spinner-approachcircle"), Texture = source.GetTexture("spinner-approachcircle"),
Scale = new Vector2(SPRITE_SCALE * 1.86f), Scale = new Vector2(SPRITE_SCALE * 1.86f),
Y = SPINNER_Y_CENTRE,
}); });
} }
} }
@ -143,7 +140,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
glow.Alpha = DrawableSpinner.Progress; glow.Alpha = DrawableSpinner.Progress;
scaleContainer.Scale = new Vector2(0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f); scaleContainer.Scale = new Vector2(SPRITE_SCALE * (0.8f + (float)Interpolation.ApplyEasing(Easing.Out, DrawableSpinner.Progress) * 0.2f));
} }
} }
} }