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

Remove drag from class/method namings + refactor

Browse Source
This commit is contained in:
smoogipoo
2019-10-08 19:08:23 +09:00
parent 08d043f447
commit 8b661e624d
6 changed files with 69 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Timing;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Mania.Edit.Blueprints;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.UI;
@ -30,16 +29,16 @@ namespace osu.Game.Rulesets.Mania.Edit
editorClock = clock;
}
public override void HandleDrag(SelectionBlueprint blueprint, SelectionDragEvent dragEvent)
public override void HandleMovement(MoveSelectionEvent moveEvent)
{
var maniaBlueprint = (ManiaSelectionBlueprint)blueprint;
var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
int lastColumn = maniaBlueprint.HitObject.HitObject.Column;
adjustOrigins(maniaBlueprint);
performDragMovement(dragEvent);
performColumnMovement(lastColumn, dragEvent);
performDragMovement(moveEvent);
performColumnMovement(lastColumn, moveEvent);
base.HandleDrag(blueprint, dragEvent);
base.HandleMovement(moveEvent);
}
/// <summary>
@ -64,7 +63,7 @@ namespace osu.Game.Rulesets.Mania.Edit
b.HitObject.Y += movementDelta;
}
private void performDragMovement(SelectionDragEvent dragEvent)
private void performDragMovement(MoveSelectionEvent moveEvent)
{
foreach (var b in SelectedBlueprints)
{
@ -74,7 +73,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.InstantDragDelta.Y;
hitObject.Y += moveEvent.InstantDelta.Y;
float targetPosition;
@ -96,9 +95,9 @@ namespace osu.Game.Rulesets.Mania.Edit
}
}
private void performColumnMovement(int lastColumn, SelectionDragEvent dragEvent)
private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
{
var currentColumn = composer.ColumnAt(dragEvent.ScreenSpaceDragPosition);
var currentColumn = composer.ColumnAt(moveEvent.ScreenSpacePosition);
if (currentColumn == null)
return;