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

Add container to handle placement mask

Browse Source
This commit is contained in:
smoogipoo
2018-10-17 16:17:12 +09:00
parent 4ea4ec0d25
commit 62635c5ab8
3 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,10 +36,9 @@ namespace osu.Game.Rulesets.Edit
private IPlacementHandler placementHandler { get; set; }
private HitObjectMaskLayer maskLayer;
private Container placementContainer;
private EditRulesetContainer rulesetContainer;
private HitObjectCompositionTool compositionTool;
private readonly Bindable<HitObjectCompositionTool> compositionTool = new Bindable<HitObjectCompositionTool>();
protected HitObjectComposer(Ruleset ruleset)
{
@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Edit
layerAboveRuleset.Children = new Drawable[]
{
maskLayer = new HitObjectMaskLayer(),
placementContainer = new Container { RelativeSizeAxes = Axes.Both }
new PlacementContainer(compositionTool),
};
layerContainers.Add(layerBelowRuleset);
@ -118,21 +117,14 @@ namespace osu.Game.Rulesets.Edit
};
toolboxCollection.Items =
CompositionTools.Select(t => new RadioButton(t.Name, () => setCompositionTool(t)))
.Prepend(new RadioButton("Select", () => setCompositionTool(null)))
CompositionTools.Select(t => new RadioButton(t.Name, () => compositionTool.Value = t))
.Prepend(new RadioButton("Select", () => compositionTool.Value = null))
.ToList();
toolboxCollection.Items[0].Select();
placementHandler.PlacementFinished += h =>
{
var drawableObject = rulesetContainer.AddHitObject(h);
maskLayer.AddMask(drawableObject);
// Re-construct the mask
setCompositionTool(compositionTool);
};
// Todo: no
placementHandler.PlacementFinished += h => maskLayer.AddMask(rulesetContainer.AddHitObject(h));
}
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@ -165,16 +157,6 @@ namespace osu.Game.Rulesets.Edit
});
}
private void setCompositionTool(HitObjectCompositionTool tool)
{
compositionTool = tool;
placementContainer.Clear(true);
if (tool != null)
placementContainer.Child = tool.CreatePlacementMask();
}
protected abstract EditRulesetContainer CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap);
protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }