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

Move selection relative to the hitobject start positions

Browse Source
This commit is contained in:
smoogipoo
2019-10-08 18:57:03 +09:00
parent dba526279e
commit 08d043f447
7 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
View File

@ -3,7 +3,6 @@
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Input.Events;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Edit.Blueprints;
@ -31,11 +30,14 @@ namespace osu.Game.Rulesets.Mania.Edit
editorClock = clock;
}
public override void HandleDrag(SelectionBlueprint blueprint, DragEvent dragEvent)
public override void HandleDrag(SelectionBlueprint blueprint, SelectionDragEvent dragEvent)
{
adjustOrigins((ManiaSelectionBlueprint)blueprint);
var maniaBlueprint = (ManiaSelectionBlueprint)blueprint;
int lastColumn = maniaBlueprint.HitObject.HitObject.Column;
adjustOrigins(maniaBlueprint);
performDragMovement(dragEvent);
performColumnMovement(dragEvent);
performColumnMovement(lastColumn, dragEvent);
base.HandleDrag(blueprint, dragEvent);
}
@ -62,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Edit
b.HitObject.Y += movementDelta;
}
private void performDragMovement(DragEvent dragEvent)
private void performDragMovement(SelectionDragEvent dragEvent)
{
foreach (var b in SelectedBlueprints)
{
@ -72,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Edit
// Using the hitobject position is required since AdjustPosition can be invoked multiple times per frame
// without the position having been updated by the parenting ScrollingHitObjectContainer
hitObject.Y += dragEvent.Delta.Y;
hitObject.Y += dragEvent.InstantDragDelta.Y;
float targetPosition;
@ -94,14 +96,13 @@ namespace osu.Game.Rulesets.Mania.Edit
}
}
private void performColumnMovement(DragEvent dragEvent)
private void performColumnMovement(int lastColumn, SelectionDragEvent dragEvent)
{
var lastColumn = composer.ColumnAt(dragEvent.ScreenSpaceLastMousePosition);
var currentColumn = composer.ColumnAt(dragEvent.ScreenSpaceMousePosition);
if (lastColumn == null || currentColumn == null)
var currentColumn = composer.ColumnAt(dragEvent.ScreenSpaceDragPosition);
if (currentColumn == null)
return;
int columnDelta = currentColumn.Index - lastColumn.Index;
int columnDelta = currentColumn.Index - lastColumn;
if (columnDelta == 0)
return;