sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

HitObjectMaskLayer -> BlueprintContainer

Browse Source
This commit is contained in:
smoogipoo
2018-11-06 17:36:10 +09:00
parent faab744cbd
commit 26c9390c16
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual
typeof(DragBox), typeof(DragBox),
typeof(HitObjectComposer), typeof(HitObjectComposer),
typeof(OsuHitObjectComposer), typeof(OsuHitObjectComposer),
typeof(HitObjectMaskLayer), typeof(BlueprintContainer),
typeof(NotNullAttribute), typeof(NotNullAttribute),
typeof(HitCirclePiece), typeof(HitCirclePiece),
typeof(HitCircleSelectionMask), typeof(HitCircleSelectionMask),

8
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Edit
private EditRulesetContainer rulesetContainer; private EditRulesetContainer rulesetContainer;
private HitObjectMaskLayer maskLayer; private BlueprintContainer blueprintContainer;
private PlacementContainer placementContainer; private PlacementContainer placementContainer;
internal HitObjectComposer(Ruleset ruleset) internal HitObjectComposer(Ruleset ruleset)
@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Edit
var layerAboveRuleset = CreateLayerContainer(); var layerAboveRuleset = CreateLayerContainer();
layerAboveRuleset.Children = new Drawable[] layerAboveRuleset.Children = new Drawable[]
{ {
maskLayer = new HitObjectMaskLayer(), blueprintContainer = new BlueprintContainer(),
placementContainer = new PlacementContainer(), placementContainer = new PlacementContainer(),
}; };
@ -148,11 +148,11 @@ namespace osu.Game.Rulesets.Edit
/// <param name="hitObject">The <see cref="HitObject"/> to add.</param> /// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
public void Add(HitObject hitObject) public void Add(HitObject hitObject)
{ {
maskLayer.AddMaskFor(rulesetContainer.Add(hitObject)); blueprintContainer.AddMaskFor(rulesetContainer.Add(hitObject));
placementContainer.Refresh(); placementContainer.Refresh();
} }
public void Remove(HitObject hitObject) => maskLayer.RemoveMaskFor(rulesetContainer.Remove(hitObject)); public void Remove(HitObject hitObject) => blueprintContainer.RemoveMaskFor(rulesetContainer.Remove(hitObject));
internal abstract EditRulesetContainer CreateRulesetContainer(); internal abstract EditRulesetContainer CreateRulesetContainer();

4
osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs → osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs
View File

@ -11,14 +11,14 @@ using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Layers
{ {
public class HitObjectMaskLayer : CompositeDrawable public class BlueprintContainer : CompositeDrawable
{ {
private MaskContainer maskContainer; private MaskContainer maskContainer;
[Resolved] [Resolved]
private HitObjectComposer composer { get; set; } private HitObjectComposer composer { get; set; }
public HitObjectMaskLayer() public BlueprintContainer()
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
} }