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

Merge branch 'master' into slider-placement

Browse Source
This commit is contained in:
Dean Herbert
2018-11-02 19:45:34 +09:00
committed by GitHub
parent e6ee3dc73e e2c520770e
commit 63cbc8e0e8
11 changed files with 250 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -10,6 +10,7 @@ using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks;
using osu.Game.Rulesets.Osu.Edit.Masks.SliderMasks;
using osu.Game.Rulesets.Osu.Edit.Masks.SpinnerMasks;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Objects.Drawables;
using osu.Game.Rulesets.Osu.UI;
@ -31,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
{
new HitCircleCompositionTool(),
new SliderCompositionTool(),
new SpinnerCompositionTool()
};
protected override Container CreateLayerContainer() => new PlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
@ -43,6 +45,8 @@ namespace osu.Game.Rulesets.Osu.Edit
return new HitCircleSelectionMask(circle);
case DrawableSlider slider:
return new SliderSelectionMask(slider);
case DrawableSpinner spinner:
return new SpinnerSelectionMask(spinner);
}
return base.CreateMaskFor(hitObject);