diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseHitCirclePlacementMask.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseHitCirclePlacementMask.cs
index be0b94c4c8..8e41a28440 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestCaseHitCirclePlacementMask.cs
+++ b/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();
}
}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderPlacementMask.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSliderPlacementMask.cs
index 889ea0c311..5dd7a99aad 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestCaseSliderPlacementMask.cs
+++ b/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();
}
}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs b/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs
index c2c7942c57..1ca203e474 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestCaseSpinnerPlacementMask.cs
+++ b/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();
}
}
diff --git a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
index 767c7db5da..d7a4c7a6b7 100644
--- a/osu.Game.Rulesets.Osu/Edit/HitCircleCompositionTool.cs
+++ b/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();
}
}
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementBlueprint.cs
similarity index 91%
rename from osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementBlueprint.cs
index 0d0acbed7d..ec32b7d74d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCirclePlacementMask.cs
+++ b/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);
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementBlueprint.cs
similarity index 98%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementBlueprint.cs
index 12e768d58e..bf2acc2f3c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/SliderPlacementMask.cs
+++ b/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;
diff --git a/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs b/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementBlueprint.cs
similarity index 91%
rename from osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs
rename to osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementBlueprint.cs
index cd5d6cff04..ca7a2f7b01 100644
--- a/osu.Game.Rulesets.Osu/Edit/Masks/SpinnerMasks/SpinnerPlacementMask.cs
+++ b/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 };
diff --git a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
index fd0430ce4c..050c538329 100644
--- a/osu.Game.Rulesets.Osu/Edit/SliderCompositionTool.cs
+++ b/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();
}
}
diff --git a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs b/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
index a1419fe281..4401496327 100644
--- a/osu.Game.Rulesets.Osu/Edit/SpinnerCompositionTool.cs
+++ b/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();
}
}
diff --git a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs b/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
index ff82034648..0e337acd2f 100644
--- a/osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
+++ b/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;
diff --git a/osu.Game/Rulesets/Edit/PlacementMask.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
similarity index 90%
rename from osu.Game/Rulesets/Edit/PlacementMask.cs
rename to osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 97c6a74c92..7e5a592a0d 100644
--- a/osu.Game/Rulesets/Edit/PlacementMask.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Edit
///
/// A mask which governs the creation of a new to actualisation.
///
- public abstract class PlacementMask : CompositeDrawable, IRequireHighFrequencyMousePosition
+ public abstract class PlacementBlueprint : CompositeDrawable, IRequireHighFrequencyMousePosition
{
///
/// The 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
///
/// Signals that the placement of has finished.
- /// This will destroy this , and add the to the .
+ /// This will destroy this , and add the to the .
///
protected void EndPlacement()
{
diff --git a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs b/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
index c5d64e3d4d..1a20f165c0 100644
--- a/osu.Game/Rulesets/Edit/Tools/HitObjectCompositionTool.cs
+++ b/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();
}
}
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs
index 730dedb53f..f781da0c60 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs
+++ b/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 placementBlueprintContainer;
+ private Container placementBlueprintContainer;
private SelectionBox selectionBox;
private IEnumerable 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 { RelativeSizeAxes = Axes.Both },
+ placementBlueprintContainer = new Container { RelativeSizeAxes = Axes.Both },
dragBox.CreateProxy()
};
diff --git a/osu.Game/Tests/Visual/HitObjectPlacementMaskTestCase.cs b/osu.Game/Tests/Visual/HitObjectPlacementMaskTestCase.cs
index adf74b9a7d..e33d92da88 100644
--- a/osu.Game/Tests/Visual/HitObjectPlacementMaskTestCase.cs
+++ b/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);
- Add(currentMask = CreateMask());
+ Remove(currentBlueprint);
+ 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();
}
}