From e8cbde3ae18746e0b96f17e6ddea0114590085b0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Nov 2017 21:56:12 +0900
Subject: [PATCH] Add overlay/underlay

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 14 ++++++++----
 osu.Game/Rulesets/Edit/PlayfieldOverlay.cs  | 24 +++++++++++++++++++++
 osu.Game/Rulesets/Edit/PlayfieldUnderlay.cs | 21 ++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetContainer.cs    | 10 ++++-----
 osu.Game/osu.Game.csproj                    |  2 ++
 5 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/PlayfieldOverlay.cs
 create mode 100644 osu.Game/Rulesets/Edit/PlayfieldUnderlay.cs

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index b06af84ec8..3aa633115b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Edit
     {
         private readonly Ruleset ruleset;
 
+        protected ICompositionTool CurrentTool { get; private set; }
+
         protected HitObjectComposer(Ruleset ruleset)
         {
             this.ruleset = ruleset;
@@ -75,7 +77,9 @@ namespace osu.Game.Rulesets.Edit
                                     Alpha = 0,
                                     AlwaysPresent = true,
                                 },
-                                rulesetContainer
+                                CreateUnderlay(rulesetContainer.Playfield),
+                                rulesetContainer,
+                                CreateOverlay(rulesetContainer.Playfield)
                             }
                         }
                     },
@@ -98,12 +102,14 @@ namespace osu.Game.Rulesets.Edit
             toolboxCollection.Items[0].Select();
         }
 
-        private void setCompositionTool(ICompositionTool tool)
-        {
-        }
+        private void setCompositionTool(ICompositionTool tool) => CurrentTool = tool;
 
         protected virtual RulesetContainer CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap) => ruleset.CreateRulesetContainerWith(beatmap, true);
 
+        protected virtual PlayfieldUnderlay CreateUnderlay(Playfield playfield) => new PlayfieldUnderlay(playfield);
+
+        protected virtual PlayfieldOverlay CreateOverlay(Playfield playfield) => new PlayfieldOverlay(playfield);
+
         protected abstract IReadOnlyList<ICompositionTool> CompositionTools { get; }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/PlayfieldOverlay.cs b/osu.Game/Rulesets/Edit/PlayfieldOverlay.cs
new file mode 100644
index 0000000000..2138079784
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/PlayfieldOverlay.cs
@@ -0,0 +1,24 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public class PlayfieldOverlay : CompositeDrawable
+    {
+
+        private Playfield playfield;
+
+        public PlayfieldOverlay(Playfield playfield)
+        {
+            this.playfield = playfield;
+
+            RelativeSizeAxes = Axes.Both;
+
+        }
+
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/PlayfieldUnderlay.cs b/osu.Game/Rulesets/Edit/PlayfieldUnderlay.cs
new file mode 100644
index 0000000000..7a18c59613
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/PlayfieldUnderlay.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public class PlayfieldUnderlay : CompositeDrawable
+    {
+        private readonly Playfield playfield;
+
+        public PlayfieldUnderlay(Playfield playfield)
+        {
+            this.playfield = playfield;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/RulesetContainer.cs b/osu.Game/Rulesets/UI/RulesetContainer.cs
index ec26f6f310..69bf6bba29 100644
--- a/osu.Game/Rulesets/UI/RulesetContainer.cs
+++ b/osu.Game/Rulesets/UI/RulesetContainer.cs
@@ -55,6 +55,11 @@ namespace osu.Game.Rulesets.UI
 
         public abstract IEnumerable<HitObject> Objects { get; }
 
+        /// <summary>
+        /// The playfield.
+        /// </summary>
+        public Playfield Playfield { get; protected set; }
+
         protected readonly Ruleset Ruleset;
 
         /// <summary>
@@ -135,11 +140,6 @@ namespace osu.Game.Rulesets.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new ScoreProcessor<TObject>(this);
 
-        /// <summary>
-        /// The playfield.
-        /// </summary>
-        public Playfield Playfield { get; private set; }
-
         protected override Container<Drawable> Content => content;
         private Container content;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e1425ff8b8..ad1370890f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -302,6 +302,8 @@
     <Compile Include="Overlays\Profile\Sections\Ranks\DrawableTotalScore.cs" />
     <Compile Include="Overlays\Profile\Sections\Ranks\ScoreModsContainer.cs" />
     <Compile Include="Overlays\Settings\SettingsButton.cs" />
+    <Compile Include="Rulesets\Edit\PlayfieldOverlay.cs" />
+    <Compile Include="Rulesets\Edit\PlayfieldUnderlay.cs" />
     <Compile Include="Screens\Edit\Components\BottomBarContainer.cs" />
     <Compile Include="Screens\Edit\Components\PlaybackControl.cs" />
     <Compile Include="Screens\Edit\Components\TimeInfoContainer.cs" />