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

Refactor blueprint container drag code

Browse Source
This commit is contained in:
ekrctb
2022-10-11 22:39:53 +09:00
parent 1a24762f9b
commit fcb9e2cc00
4 changed files with 38 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
View File

@ -12,7 +12,6 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Game.Audio;
using osu.Game.Graphics.UserInterface;
@ -37,9 +36,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected new EditorSelectionHandler SelectionHandler => (EditorSelectionHandler)base.SelectionHandler;
private PlacementBlueprint currentPlacement;
private InputManager inputManager;
private DragEvent lastDragEvent;
/// <remarks>
/// Positional input must be received outside the container's bounds,
@ -68,8 +64,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
base.LoadComplete();
inputManager = GetContainingInputManager();
Beatmap.HitObjectAdded += hitObjectAdded;
// updates to selected are handled for us by SelectionHandler.
@ -120,18 +114,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
return false;
}
protected override void OnDrag(DragEvent e)
{
base.OnDrag(e);
lastDragEvent = e;
}
protected override void OnDragEnd(DragEndEvent e)
{
base.OnDragEnd(e);
lastDragEvent = null;
}
/// <summary>
/// Move the current selection spatially by the specified delta, in gamefield coordinates (ie. the same coordinates as the blueprints).
/// </summary>
@ -234,7 +216,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void updatePlacementPosition()
{
var snapResult = Composer.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
var snapResult = Composer.FindSnappedPositionAndTime(InputManager.CurrentState.Mouse.Position);
// if no time was found from positional snapping, we should still quantize to the beat.
snapResult.Time ??= Beatmap.SnapTime(EditorClock.CurrentTime, null);
@ -248,10 +230,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
base.Update();
// trigger every frame so drags continue to update selection while seeking time.
if (lastDragEvent != null)
OnDrag(lastDragEvent);
if (currentPlacement != null)
{
switch (currentPlacement.PlacementActive)