sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Re-implement composition tools + implement placement masks

Browse Source
This commit is contained in:
smoogipoo
2018-10-03 16:27:26 +09:00
parent 540a010fbb
commit 3420e0c7eb
9 changed files with 171 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,12 @@ namespace osu.Game.Rulesets.Edit
public IEnumerable<DrawableHitObject> HitObjects => rulesetContainer.Playfield.AllHitObjects;
protected ICompositionTool CurrentTool { get; private set; }
protected IRulesetConfigManager Config { get; private set; }
private readonly List<Container> layerContainers = new List<Container>();
private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private Container placementContainer;
private EditRulesetContainer rulesetContainer;
protected HitObjectComposer(Ruleset ruleset)
@ -64,7 +64,11 @@ namespace osu.Game.Rulesets.Edit
};
var layerAboveRuleset = CreateLayerContainer();
layerAboveRuleset.Child = new HitObjectMaskLayer();
layerAboveRuleset.Children = new Drawable[]
{
new HitObjectMaskLayer(),
placementContainer = new Container { RelativeSizeAxes = Axes.Both }
};
layerContainers.Add(layerBelowRuleset);
layerContainers.Add(layerAboveRuleset);
@ -144,11 +148,28 @@ namespace osu.Game.Rulesets.Edit
});
}
private void setCompositionTool(ICompositionTool tool) => CurrentTool = tool;
private void setCompositionTool(HitObjectCompositionTool tool)
{
placementContainer.Clear(true);
if (tool != null)
{
var mask = tool.CreatePlacementMask();
mask.PlacementFinished += h =>
{
rulesetContainer.AddHitObject(h);
// Re-construct the mask
setCompositionTool(tool);
};
placementContainer.Child = mask;
}
}
protected abstract EditRulesetContainer CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap);
protected abstract IReadOnlyList<ICompositionTool> CompositionTools { get; }
protected abstract IReadOnlyList<HitObjectCompositionTool> CompositionTools { get; }
/// <summary>
/// Creates a <see cref="SelectionMask"/> for a specific <see cref="DrawableHitObject"/>.