From 1d40a042f6ff8da4bc14b1c6997c092140febba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Nov 2018 18:32:44 +0900
Subject: [PATCH] Extract common methods into ManiaPlacementBlueprint

---
 .../Blueprints/ManiaPlacementBlueprint.cs     | 61 +++++++++++++++++++
 .../Edit/Blueprints/NotePlacementBlueprint.cs | 39 ++----------
 2 files changed, 66 insertions(+), 34 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
new file mode 100644
index 0000000000..402a124f01
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -0,0 +1,61 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Mania.Edit.Blueprints
+{
+    public class ManiaPlacementBlueprint<T> : PlacementBlueprint
+        where T : ManiaHitObject
+    {
+        protected new T HitObject => (T)base.HitObject;
+
+        [Resolved]
+        private ManiaHitObjectComposer composer { get; set; }
+
+        [Resolved]
+        private IScrollingInfo scrollingInfo { get; set; }
+
+        public ManiaPlacementBlueprint(T hitObject)
+            : base(hitObject)
+        {
+            RelativeSizeAxes = Axes.None;
+        }
+
+        protected double TimeAt(Vector2 screenSpacePosition)
+        {
+            var column = ColumnAt(screenSpacePosition);
+            if (column == null)
+                return 0;
+
+            return scrollingInfo.Algorithm.TimeAt(column.HitObjectContainer.ToLocalSpace(applyPositionOffset(screenSpacePosition)).Y,
+                EditorClock.CurrentTime,
+                scrollingInfo.TimeRange.Value,
+                column.HitObjectContainer.DrawHeight);
+        }
+
+        protected Column ColumnAt(Vector2 screenSpacePosition)
+            => composer.ColumnAt(applyPositionOffset(screenSpacePosition));
+
+        private Vector2 applyPositionOffset(Vector2 position)
+        {
+            switch (scrollingInfo.Direction.Value)
+            {
+                case ScrollingDirection.Up:
+                    position.Y -= DrawHeight / 2;
+                    break;
+                case ScrollingDirection.Down:
+                    position.Y += DrawHeight / 2;
+                    break;
+            }
+
+            return position;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 7102d328ec..1549b0ae45 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -1,31 +1,19 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class NotePlacementBlueprint : PlacementBlueprint
+    public class NotePlacementBlueprint : ManiaPlacementBlueprint<Note>
     {
-        protected new Note HitObject => (Note)base.HitObject;
-
-        [Resolved]
-        private ManiaHitObjectComposer composer { get; set; }
-
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
-
         public NotePlacementBlueprint()
             : base(new Note())
         {
-            RelativeSizeAxes = Axes.None;
-
             Origin = Anchor.Centre;
 
             AutoSizeAxes = Axes.Y;
@@ -42,28 +30,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override bool OnClick(ClickEvent e)
         {
-            var offsetPosition = e.ScreenSpaceMousePosition;
-            switch (scrollingInfo.Direction.Value)
-            {
-                case ScrollingDirection.Up:
-                    offsetPosition.Y -= DrawHeight / 2;
-                    break;
-                case ScrollingDirection.Down:
-                    offsetPosition.Y += DrawHeight / 2;
-                    break;
-            }
-
-            var column = composer.ColumnAt(offsetPosition);
-            if (column == null)
+            Column column;
+            if ((column = ColumnAt(e.ScreenSpaceMousePosition)) == null)
                 return base.OnClick(e);
 
-            var hitObjectContainer = column.HitObjectContainer;
-
-            HitObject.StartTime = scrollingInfo.Algorithm.TimeAt(hitObjectContainer.ToLocalSpace(offsetPosition).Y,
-                EditorClock.CurrentTime,
-                scrollingInfo.TimeRange.Value,
-                hitObjectContainer.DrawHeight);
-
+            HitObject.StartTime = TimeAt(e.ScreenSpaceMousePosition);
             HitObject.Column = column.Index;
 
             EndPlacement();