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

Merge branch 'master' into placement-blueprint-movement

Browse Source
This commit is contained in:
Dean Herbert
2019-10-04 19:05:56 +08:00
committed by GitHub
parent f2ba87a1d2 5098cfe556
commit 6fce646369
51 changed files with 1203 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ namespace osu.Game.Rulesets.Edit
editorBeatmap = new EditorBeatmap<TObject>(playableBeatmap);
editorBeatmap.HitObjectAdded += addHitObject;
editorBeatmap.HitObjectRemoved += removeHitObject;
editorBeatmap.StartTimeChanged += updateHitObject;
var dependencies = new DependencyContainer(parent);
dependencies.CacheAs<IEditorBeatmap>(editorBeatmap);
@ -162,12 +163,7 @@ namespace osu.Game.Rulesets.Edit
});
}
private void addHitObject(HitObject hitObject)
{
beatmapProcessor?.PreProcess();
hitObject.ApplyDefaults(playableBeatmap.ControlPointInfo, playableBeatmap.BeatmapInfo.BaseDifficulty);
beatmapProcessor?.PostProcess();
}
private void addHitObject(HitObject hitObject) => updateHitObject(hitObject);
private void removeHitObject(HitObject hitObject)
{
@ -175,6 +171,13 @@ namespace osu.Game.Rulesets.Edit
beatmapProcessor?.PostProcess();
}
private void updateHitObject(HitObject hitObject)
{
beatmapProcessor?.PreProcess();
hitObject.ApplyDefaults(playableBeatmap.ControlPointInfo, playableBeatmap.BeatmapInfo.BaseDifficulty);
beatmapProcessor?.PostProcess();
}
public override IEnumerable<DrawableHitObject> HitObjects => drawableRulesetWrapper.Playfield.AllHitObjects;
public override bool CursorInPlacementArea => drawableRulesetWrapper.Playfield.ReceivePositionalInputAt(inputManager.CurrentState.Mouse.Position);