RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HitObjectMaskLayer -> BlueprintContainer

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
Show Stats 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 @@ public class TestCaseHitObjectComposer : OsuTestCase, IPlacementHandler
typeof(DragBox),
typeof(HitObjectComposer),
typeof(OsuHitObjectComposer),
typeof(HitObjectMaskLayer),
typeof(BlueprintContainer),
typeof(NotNullAttribute),
typeof(HitCirclePiece),
typeof(HitCircleSelectionMask),

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

@ -35,7 +35,7 @@ public abstract class HitObjectComposer : CompositeDrawable
private EditRulesetContainer rulesetContainer;
private HitObjectMaskLayer maskLayer;
private BlueprintContainer blueprintContainer;
private PlacementContainer placementContainer;
internal HitObjectComposer(Ruleset ruleset)
@ -67,7 +67,7 @@ private void load(IBindableBeatmap beatmap, IFrameBasedClock framedClock)
var layerAboveRuleset = CreateLayerContainer();
layerAboveRuleset.Children = new Drawable[]
{
maskLayer = new HitObjectMaskLayer(),
blueprintContainer = new BlueprintContainer(),
placementContainer = new PlacementContainer(),
};
@ -148,11 +148,11 @@ protected override void UpdateAfterChildren()
/// <param name="hitObject">The <see cref="HitObject"/> to add.</param>
public void Add(HitObject hitObject)
{
maskLayer.AddMaskFor(rulesetContainer.Add(hitObject));
blueprintContainer.AddMaskFor(rulesetContainer.Add(hitObject));
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();

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 @@
namespace osu.Game.Screens.Edit.Screens.Compose.Layers
{
public class HitObjectMaskLayer : CompositeDrawable
public class BlueprintContainer : CompositeDrawable
{
private MaskContainer maskContainer;
[Resolved]
private HitObjectComposer composer { get; set; }
public HitObjectMaskLayer()
public BlueprintContainer()
{
RelativeSizeAxes = Axes.Both;
}