h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:42:55 +08:00
Code Issues Releases Wiki Activity

Move radius adjust local to fruit piece

Browse Source
This commit is contained in:
Dean Herbert 2020-02-19 09:39:56 +09:00
parent ded7f5ff1b
commit 73e5018696
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
View File

@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
{ {
private Container scaleContainer; private Container scaleContainer;
/// <summary>
/// Because we're adding a border around the fruit, we need to scale down some.
/// </summary>
public const float RADIUS_ADJUST = 1.1f;
public DrawableFruit(Fruit h) public DrawableFruit(Fruit h)
: base(h) : base(h)
{ {

9
osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
View File

@ -16,6 +16,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
{ {
internal class FruitPiece : CompositeDrawable internal class FruitPiece : CompositeDrawable
{ {
/// <summary>
/// Because we're adding a border around the fruit, we need to scale down some.
/// </summary>
private const float radius_adjust = 1.1f;
private Circle border; private Circle border;
private CatchHitObject hitObject; private CatchHitObject hitObject;
@ -44,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
BorderColour = Color4.White, BorderColour = Color4.White,
BorderThickness = 6f * DrawableFruit.RADIUS_ADJUST, BorderThickness = 6f * radius_adjust,
Children = new Framework.Graphics.Drawable[] Children = new Framework.Graphics.Drawable[]
{ {
new Box new Box
@ -82,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation) private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
{ {
const float large_pulp_3 = 16f * DrawableFruit.RADIUS_ADJUST; const float large_pulp_3 = 16f * radius_adjust;
const float distance_from_centre_3 = 0.15f; const float distance_from_centre_3 = 0.15f;
const float large_pulp_4 = large_pulp_3 * 0.925f; const float large_pulp_4 = large_pulp_3 * 0.925f;