h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-23 22:53:04 +08:00
Code Issues Releases Wiki Activity

Add AddHitObjectCommand and RemoveHitObjectCommand

Browse Source
This commit is contained in:
Marvin Schürz 2024-10-08 20:29:27 +02:00
parent 867e986240
commit fe9e84b47d
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Screens.Edit; using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Commands;
using osu.Game.Screens.Edit.Components.RadioButtons; using osu.Game.Screens.Edit.Components.RadioButtons;
using osu.Game.Screens.Edit.Components.TernaryButtons; using osu.Game.Screens.Edit.Components.TernaryButtons;
using osu.Game.Screens.Edit.Compose; using osu.Game.Screens.Edit.Compose;
@ -483,20 +484,23 @@ namespace osu.Game.Rulesets.Edit
EditorBeatmap.PlacementObject.Value = hitObject; EditorBeatmap.PlacementObject.Value = hitObject;
} }
[Resolved(canBeNull: true)]
private EditorCommandHandler commandHandler { get; set; }
public void EndPlacement(HitObject hitObject, bool commit) public void EndPlacement(HitObject hitObject, bool commit)
{ {
EditorBeatmap.PlacementObject.Value = null; EditorBeatmap.PlacementObject.Value = null;
if (commit) if (commit)
{ {
EditorBeatmap.Add(hitObject); commandHandler.SafeSubmit(new AddHitObjectCommand(EditorBeatmap, hitObject), true);
if (autoSeekOnPlacement.Value && EditorClock.CurrentTime < hitObject.StartTime) if (autoSeekOnPlacement.Value && EditorClock.CurrentTime < hitObject.StartTime)
EditorClock.SeekSmoothlyTo(hitObject.StartTime); EditorClock.SeekSmoothlyTo(hitObject.StartTime);
} }
} }
public void Delete(HitObject hitObject) => EditorBeatmap.Remove(hitObject); public void Delete(HitObject hitObject) => commandHandler.SafeSubmit(new RemoveHitObjectCommand(EditorBeatmap, hitObject));
#endregion #endregion

24
osu.Game/Screens/Edit/Commands/AddHitObjectCommand.cs Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Rulesets.Objects;
namespace osu.Game.Screens.Edit.Commands
{
public class AddHitObjectCommand : IEditorCommand
{
public EditorBeatmap Beatmap;
public HitObject HitObject;
public AddHitObjectCommand(EditorBeatmap beatmap, HitObject hitObject)
{
Beatmap = beatmap;
HitObject = hitObject;
}
public void Apply() => Beatmap.Add(HitObject);
public IEditorCommand CreateUndo() => new RemoveHitObjectCommand(Beatmap, HitObject);
}
}

24
osu.Game/Screens/Edit/Commands/RemoveHitObjectCommand.cs Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Rulesets.Objects;
namespace osu.Game.Screens.Edit.Commands
{
public class RemoveHitObjectCommand : IEditorCommand
{
public EditorBeatmap Beatmap;
public HitObject HitObject;
public RemoveHitObjectCommand(EditorBeatmap beatmap, HitObject hitObject)
{
Beatmap = beatmap;
HitObject = hitObject;
}
public void Apply() => Beatmap.Remove(HitObject);
public IEditorCommand CreateUndo() => new AddHitObjectCommand(Beatmap, HitObject);
}
}