PlacementMask -> PlacementBlueprint

osu.Game.Rulesets.Osu.Tests/TestCaseHitCirclePlacementMask.cs

@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     public class TestCaseHitCirclePlacementMask : HitObjectPlacementMaskTestCase
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHitCircle((HitCircle)hitObject);
-        protected override PlacementMask CreateMask() => new HitCirclePlacementMask();
+        protected override PlacementBlueprint CreateMask() => new HitCirclePlacementBlueprint();
     }
 }

osu.Game.Rulesets.Osu.Tests/TestCaseSliderPlacementMask.cs

@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     public class TestCaseSliderPlacementMask : HitObjectPlacementMaskTestCase
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSlider((Slider)hitObject);
-        protected override PlacementMask CreateMask() => new SliderPlacementMask();
+        protected override PlacementBlueprint CreateMask() => new SliderPlacementBlueprint();
     }
 }

osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs

@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableSpinner((Spinner)hitObject);
 
-        protected override PlacementMask CreateMask() => new SpinnerPlacementMask();
+        protected override PlacementBlueprint CreateMask() => new SpinnerPlacementBlueprint();
     }
 }

osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs

@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        public override PlacementMask CreatePlacementMask() => new HitCirclePlacementMask();
+        public override PlacementBlueprint CreatePlacementMask() => new HitCirclePlacementBlueprint();
     }
 }

osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementBlueprint.cs

@@ -8,11 +8,11 @@ using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks
 {
-    public class HitCirclePlacementMask : PlacementMask
+    public class HitCirclePlacementBlueprint : PlacementBlueprint
     {
         public new HitCircle HitObject => (HitCircle)base.HitObject;
 
-        public HitCirclePlacementMask()
+        public HitCirclePlacementBlueprint()
             : base(new HitCircle())
         {
             InternalChild = new HitCirclePiece(HitObject);

osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementBlueprint.cs

@@ -18,7 +18,7 @@ using OpenTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.SliderMasks
 {
-    public class SliderPlacementMask : PlacementMask
+    public class SliderPlacementBlueprint : PlacementBlueprint
     {
         public new Objects.Slider HitObject => (Objects.Slider)base.HitObject;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.SliderMasks
 
         private PlacementState state;
 
-        public SliderPlacementMask()
+        public SliderPlacementBlueprint()
             : base(new Objects.Slider())
         {
             RelativeSizeAxes = Axes.Both;

osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementBlueprint.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.UI;
 
 namespace osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks
 {
-    public class SpinnerPlacementMask : PlacementMask
+    public class SpinnerPlacementBlueprint : PlacementBlueprint
     {
         public new Spinner HitObject => (Spinner)base.HitObject;
 
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks
 
         private bool isPlacingEnd;
 
-        public SpinnerPlacementMask()
+        public SpinnerPlacementBlueprint()
             : base(new Spinner { Position = OsuPlayfield.BASE_SIZE / 2 })
         {
             InternalChild = piece = new SpinnerPiece(HitObject) { Alpha = 0.5f };

osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs

@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        public override PlacementMask CreatePlacementMask() => new SliderPlacementMask();
+        public override PlacementBlueprint CreatePlacementMask() => new SliderPlacementBlueprint();
     }
 }

osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs

@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        public override PlacementMask CreatePlacementMask() => new SpinnerPlacementMask();
+        public override PlacementBlueprint CreatePlacementMask() => new SpinnerPlacementBlueprint();
     }
 }

osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs

@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual
             typeof(NotNullAttribute),
             typeof(HitCirclePiece),
             typeof(HitCircleSelectionBlueprint),
-            typeof(HitCirclePlacementMask),
+            typeof(HitCirclePlacementBlueprint),
         };
 
         private HitObjectComposer composer;

osu.Game/Rulesets/Edit/PlacementBlueprint.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A mask which governs the creation of a new <see cref="HitObject"/> to actualisation.
     /// </summary>
-    public abstract class PlacementMask : CompositeDrawable, IRequireHighFrequencyMousePosition
+    public abstract class PlacementBlueprint : CompositeDrawable, IRequireHighFrequencyMousePosition
     {
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private IPlacementHandler placementHandler { get; set; }
 
-        protected PlacementMask(HitObject hitObject)
+        protected PlacementBlueprint(HitObject hitObject)
         {
             HitObject = hitObject;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Edit
 
         /// <summary>
         /// Signals that the placement of <see cref="HitObject"/> has finished.
-        /// This will destroy this <see cref="PlacementMask"/>, and add the <see cref="HitObject"/> to the <see cref="Beatmap"/>.
+        /// This will destroy this <see cref="PlacementBlueprint"/>, and add the <see cref="HitObject"/> to the <see cref="Beatmap"/>.
         /// </summary>
         protected void EndPlacement()
         {

osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs

@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit.Tools
             Name = name;
         }
 
-        public abstract PlacementMask CreatePlacementMask();
+        public abstract PlacementBlueprint CreatePlacementMask();
     }
 }

osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
     public class BlueprintContainer : CompositeDrawable
     {
         private SelectionBlueprintContainer selectionBlueprints;
-        private Container<PlacementMask> placementBlueprintContainer;
+        private Container<PlacementBlueprint> placementBlueprintContainer;
         private SelectionBox selectionBox;
 
         private IEnumerable<SelectionBlueprint> selections => selectionBlueprints.Children.Where(c => c.IsAlive);
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
                 dragBox,
                 selectionBox,
                 selectionBlueprints = new SelectionBlueprintContainer { RelativeSizeAxes = Axes.Both },
-                placementBlueprintContainer = new Container<PlacementMask> { RelativeSizeAxes = Axes.Both },
+                placementBlueprintContainer = new Container<PlacementBlueprint> { RelativeSizeAxes = Axes.Both },
                 dragBox.CreateProxy()
             };
 

osu.Game/Tests/Visual/HitObjectPlacementMaskTestCase.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual
     public abstract class HitObjectPlacementMaskTestCase : OsuTestCase, IPlacementHandler
     {
         private readonly Container hitObjectContainer;
-        private PlacementMask currentMask;
+        private PlacementBlueprint currentBlueprint;
 
         protected HitObjectPlacementMaskTestCase()
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(currentMask = CreateMask());
+            Add(currentBlueprint = CreateMask());
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -51,8 +51,8 @@ namespace osu.Game.Tests.Visual
         {
             hitObjectContainer.Add(CreateHitObject(hitObject));
 
-            Remove(currentMask);
+            Remove(currentBlueprint);
-            Add(currentMask = CreateMask());
+            Add(currentBlueprint = CreateMask());
         }
 
         public void Delete(HitObject hitObject)
@@ -60,6 +60,6 @@ namespace osu.Game.Tests.Visual
         }
 
         protected abstract DrawableHitObject CreateHitObject(HitObject hitObject);
-        protected abstract PlacementMask CreateMask();
+        protected abstract PlacementBlueprint CreateMask();
     }
 }