RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Capture -> Select

Browse Source
This commit is contained in:
smoogipoo 2018-02-14 17:54:43 +09:00
parent a9d14eadac
commit 115484741d
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs
View File

@ -13,7 +13,7 @@ using OpenTK;
namespace osu.Game.Rulesets.Edit.Layers.Selection
{
/// <summary>
/// A box which encapsulates captured <see cref="DrawableHitObject"/>s.
/// A box which encloses <see cref="DrawableHitObject"/>s.
/// </summary>
public abstract class CaptureBox : VisibilityContainer
{

28
osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
var screenSpaceDragQuad = new Quad(dragStartPosition.X, dragStartPosition.Y, dragPosition.X - dragStartPosition.X, dragPosition.Y - dragStartPosition.Y);
selectionBox.SetDragRectangle(screenSpaceDragQuad.AABBFloat);
captureQuad(screenSpaceDragQuad);
selectQuad(screenSpaceDragQuad);
return true;
}
@ -57,15 +57,15 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
protected override bool OnDragEnd(InputState state)
{
selectionBox.Hide();
finishCapture(true);
finishSelection(true);
return true;
}
protected override bool OnClick(InputState state)
{
capturePoint(state.Mouse.NativeState.Position);
finishCapture(false);
selectPoint(state.Mouse.NativeState.Position);
finishSelection(false);
return true;
}
@ -80,29 +80,29 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
}
/// <summary>
/// Captures all hitobjects that are present within the area of a <see cref="Quad"/>.
/// Selects all hitobjects that are present within the area of a <see cref="Quad"/>.
/// </summary>
/// <param name="screenSpaceQuad">The capture <see cref="Quad"/>.</param>
private void captureQuad(Quad screenSpaceQuad)
/// <param name="screenSpaceQuad">The selection <see cref="Quad"/>.</param>
private void selectQuad(Quad screenSpaceQuad)
{
foreach (var obj in playfield.HitObjects.Objects.Where(h => h.IsAlive && h.IsPresent && screenSpaceQuad.Contains(h.SelectionPoint)))
selectedHitObjects.Add(obj);
}
/// <summary>
/// Captures the top-most hitobject that is present under a specific point.
/// Selects the top-most hitobject that is present under a specific point.
/// </summary>
/// <param name="screenSpacePoint">The <see cref="Vector2"/> to capture at.</param>
private void capturePoint(Vector2 screenSpacePoint)
/// <param name="screenSpacePoint">The <see cref="Vector2"/> to select at.</param>
private void selectPoint(Vector2 screenSpacePoint)
{
var captured = playfield.HitObjects.Objects.Reverse().Where(h => h.IsAlive && h.IsPresent).FirstOrDefault(h => h.ReceiveMouseInputAt(screenSpacePoint));
if (captured == null)
var selected = playfield.HitObjects.Objects.Reverse().Where(h => h.IsAlive && h.IsPresent).FirstOrDefault(h => h.ReceiveMouseInputAt(screenSpacePoint));
if (selected == null)
return;
selectedHitObjects.Add(captured);
selectedHitObjects.Add(selected);
}
private void finishCapture(bool fromDrag)
private void finishSelection(bool fromDrag)
{
if (selectedHitObjects.Count == 0)
return;