From b9ce98efd65965c495305158e07111a95ebec404 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Apr 2017 19:22:02 +0900
Subject: [PATCH] Add AspectAdjust to HitRenderer to allow playfield to consume
 ful HitRenderer size when needed.

---
 osu.Game.Modes.Osu/UI/OsuHitRenderer.cs     |  3 +++
 osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs | 12 ++++++++++++
 osu.Game/Modes/UI/HitRenderer.cs            | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index ca9ff6fc61..7e314c5ba1 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Beatmaps;
@@ -46,5 +47,7 @@ namespace osu.Game.Modes.Osu.UI
                 return new DrawableSpinner(spinner);
             return null;
         }
+
+        protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f);
     }
 }
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 29fa693d58..32476dff7f 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -17,6 +17,7 @@ using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Modes.Taiko.Replays;
+using OpenTK;
 
 namespace osu.Game.Modes.Taiko.UI
 {
@@ -100,6 +101,17 @@ namespace osu.Game.Modes.Taiko.UI
             }
         }
 
+        protected override Vector2 GetPlayfieldAspectAdjust()
+        {
+            const float default_relative_height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT / 768;
+            const float default_aspect = 16f / 9f;
+
+            float aspectAdjust = MathHelper.Clamp(DrawWidth / DrawHeight, 0.4f, 4) / default_aspect;
+
+            return new Vector2(1, default_relative_height * aspectAdjust);
+        }
+
+
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
         protected override IBeatmapConverter<TaikoHitObject> CreateBeatmapConverter() => new TaikoBeatmapConverter();
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index a958c61c68..afc525d686 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -16,6 +16,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Game.Modes.Replays;
 using osu.Game.Modes.Scoring;
+using OpenTK;
 
 namespace osu.Game.Modes.UI
 {
@@ -167,6 +168,11 @@ namespace osu.Game.Modes.UI
     {
         public event Action<TJudgement> OnJudgement;
 
+        /// <summary>
+        /// Whether to apply adjustments to the child <see cref="Playfield{TObject,TJudgement}"/> based on our own size.
+        /// </summary>
+        public bool AspectAdjust = true;
+
         public sealed override bool ProvidingUserCursor => !HasReplayLoaded && Playfield.ProvidingUserCursor;
 
         protected override Container<Drawable> Content => content;
@@ -219,6 +225,19 @@ namespace osu.Game.Modes.UI
             Playfield.PostProcess();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            Playfield.Size = AspectAdjust ? GetPlayfieldAspectAdjust() : Vector2.One;
+        }
+
+        /// <summary>
+        /// In some cases we want to apply changes to the relative size of our contained <see cref="Playfield{TObject, TJudgement}"/> based on custom conditions.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f); //a sane default
+
         /// <summary>
         /// Triggered when an object's Judgement is updated.
         /// </summary>