diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs b/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs index 5d1bcd1ef7..86e96f6d84 100644 --- a/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs +++ b/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs @@ -13,7 +13,7 @@ using OpenTK; namespace osu.Game.Rulesets.Edit.Layers.Selection { /// - /// A box which encapsulates captured s. + /// A box which encloses s. /// public abstract class CaptureBox : VisibilityContainer { diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs index a335108a0f..0fceced040 100644 --- a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs +++ b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs @@ -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 } /// - /// Captures all hitobjects that are present within the area of a . + /// Selects all hitobjects that are present within the area of a . /// - /// The capture . - private void captureQuad(Quad screenSpaceQuad) + /// The selection . + 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); } /// - /// Captures the top-most hitobject that is present under a specific point. + /// Selects the top-most hitobject that is present under a specific point. /// - /// The to capture at. - private void capturePoint(Vector2 screenSpacePoint) + /// The to select at. + 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;