diff --git a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs index 28077db1ba..f3010e0c59 100644 --- a/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs +++ b/osu.Game.Modes.Taiko/Objects/TaikoHitObject.cs @@ -12,7 +12,7 @@ namespace osu.Game.Modes.Taiko.Objects /// /// HitCircle radius. /// - public const float CIRCLE_RADIUS = 64; + public const float CIRCLE_RADIUS = 51; /// /// The time to scroll in the HitObject. diff --git a/osu.Game.Modes.Taiko/UI/HitTarget.cs b/osu.Game.Modes.Taiko/UI/HitTarget.cs index d38af3390e..32b2877545 100644 --- a/osu.Game.Modes.Taiko/UI/HitTarget.cs +++ b/osu.Game.Modes.Taiko/UI/HitTarget.cs @@ -18,7 +18,7 @@ namespace osu.Game.Modes.Taiko.UI /// /// Diameter of normal hit object circles. /// - private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2 * TaikoPlayfield.PLAYFIELD_SCALE; + private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2; /// /// Diameter of finisher hit object circles. @@ -47,7 +47,7 @@ namespace osu.Game.Modes.Taiko.UI Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, Y = border_offset, - Size = new Vector2(border_thickness, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset), + Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - finisher_diameter) / 2f - border_offset), Alpha = 0.1f }, new CircularContainer @@ -96,7 +96,7 @@ namespace osu.Game.Modes.Taiko.UI Anchor = Anchor.BottomCentre, Origin = Anchor.BottomCentre, Y = -border_offset, - Size = new Vector2(border_thickness, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset), + Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - finisher_diameter) / 2f - border_offset), Alpha = 0.1f }, }; diff --git a/osu.Game.Modes.Taiko/UI/InputDrum.cs b/osu.Game.Modes.Taiko/UI/InputDrum.cs index 2e4c2232fa..2c21d48960 100644 --- a/osu.Game.Modes.Taiko/UI/InputDrum.cs +++ b/osu.Game.Modes.Taiko/UI/InputDrum.cs @@ -22,7 +22,7 @@ namespace osu.Game.Modes.Taiko.UI { public InputDrum() { - Size = new Vector2(TaikoPlayfield.PlayfieldHeight); + Size = new Vector2(TaikoPlayfield.PLAYFIELD_HEIGHT); const float middle_split = 10; diff --git a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs index 9bc75a55f5..eaa8863039 100644 --- a/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs @@ -20,25 +20,15 @@ namespace osu.Game.Modes.Taiko.UI public class TaikoPlayfield : Playfield { /// - /// The default play field height. + /// The play field height. This is relative to the size of hit objects + /// such that the playfield is just a bit larger than finishers. /// - public const float PLAYFIELD_BASE_HEIGHT = 242; - - /// - /// The play field height scale. - /// This also uniformly scales the notes to match the new playfield height. - /// - public const float PLAYFIELD_SCALE = 0.65f; - - /// - /// The play field height after scaling. - /// - public static float PlayfieldHeight => PLAYFIELD_BASE_HEIGHT * PLAYFIELD_SCALE; + public const float PLAYFIELD_HEIGHT = TaikoHitObject.CIRCLE_RADIUS * 2 * 2; /// /// The offset from which the center of the hit target lies at. /// - private const float hit_target_offset = 80; + private const float hit_target_offset = TaikoHitObject.CIRCLE_RADIUS * 1.5f + 40; /// /// The size of the left area of the playfield. This area contains the input drum. @@ -61,7 +51,7 @@ namespace osu.Game.Modes.Taiko.UI public TaikoPlayfield() { RelativeSizeAxes = Axes.X; - Height = PlayfieldHeight; + Height = PLAYFIELD_HEIGHT; AddInternal(new Drawable[] { @@ -102,7 +92,6 @@ namespace osu.Game.Modes.Taiko.UI Anchor = Anchor.CentreLeft, Origin = Anchor.Centre, Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2), - Scale = new Vector2(PLAYFIELD_SCALE), BlendingMode = BlendingMode.Additive }, //barLineContainer = new Container @@ -129,7 +118,7 @@ namespace osu.Game.Modes.Taiko.UI }, leftBackgroundContainer = new Container { - Size = new Vector2(left_area_size, PlayfieldHeight), + Size = new Vector2(left_area_size, PLAYFIELD_HEIGHT), BorderThickness = 1, Children = new Drawable[] { @@ -174,7 +163,6 @@ namespace osu.Game.Modes.Taiko.UI public override void Add(DrawableHitObject h) { h.Depth = (float)h.HitObject.StartTime; - h.Scale = new Vector2(PLAYFIELD_SCALE); base.Add(h); }