From c657ef272287d0c83d57f652363b23abb55eb2cb Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 10 Jun 2022 17:27:06 +0900 Subject: [PATCH] Add ability to adjust spacing --- osu.Game/Screens/Utility/CircleGameplay.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/osu.Game/Screens/Utility/CircleGameplay.cs b/osu.Game/Screens/Utility/CircleGameplay.cs index abd7c40532..c97b5dd7a7 100644 --- a/osu.Game/Screens/Utility/CircleGameplay.cs +++ b/osu.Game/Screens/Utility/CircleGameplay.cs @@ -51,22 +51,27 @@ namespace osu.Game.Screens.Utility Vector2 location; + const float spacing = 0.1f; + + const float spacing_low = 0.5f - spacing; + const float spacing_high = 0.5f + spacing; + switch (nextLocation % 4) { default: - location = new Vector2(0.25f, 0.25f); + location = new Vector2(spacing_low, spacing_low); break; case 1: - location = new Vector2(0.75f, 0.75f); + location = new Vector2(spacing_high, spacing_high); break; case 2: - location = new Vector2(0.75f, 0.25f); + location = new Vector2(spacing_high, spacing_low); break; case 3: - location = new Vector2(0.25f, 0.75f); + location = new Vector2(spacing_low, spacing_high); break; } @@ -97,6 +102,9 @@ namespace osu.Game.Screens.Utility private const float size = 100; + public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) + => circle.ReceivePositionalInputAt(screenSpacePos); + public SampleHitCircle(double hitTime) { HitTime = hitTime; @@ -163,7 +171,7 @@ namespace osu.Game.Screens.Utility { base.Update(); - approach.Scale = new Vector2((float)MathHelper.Clamp((HitTime - Clock.CurrentTime) / 40, 1, 100)); + approach.Scale = new Vector2((float)MathHelper.Clamp((HitTime - Clock.CurrentTime) / 60, 1, 100)); if (Clock.CurrentTime > HitTime + 80) Expire();