h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-04 06:53:20 +08:00
Code Issues Releases Wiki Activity

Remove animated capture boxes for now

Browse Source
This commit is contained in:
smoogipoo 2018-02-15 18:06:33 +09:00
parent 115484741d
commit dcbc8c3dcd
3 changed files with 11 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,22 +15,12 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
/// <summary> /// <summary>
/// A box which encloses <see cref="DrawableHitObject"/>s. /// A box which encloses <see cref="DrawableHitObject"/>s.
/// </summary> /// </summary>
public abstract class CaptureBox : VisibilityContainer public class CaptureBox : VisibilityContainer
{ {
/// <summary>
/// Top-left corner of the rectangle that encloses the <see cref="DrawableHitObject"/>s.
/// </summary>
protected Vector2 FinalPosition { get; private set; }
/// <summary>
/// Size of the rectangle that encloses the <see cref="DrawableHitObject"/>s.
/// </summary>
protected Vector2 FinalSize { get; private set; }
private readonly IDrawable captureArea; private readonly IDrawable captureArea;
private readonly IReadOnlyList<DrawableHitObject> capturedObjects; private readonly IReadOnlyList<DrawableHitObject> capturedObjects;
protected CaptureBox(IDrawable captureArea, IReadOnlyList<DrawableHitObject> capturedObjects) public CaptureBox(IDrawable captureArea, IReadOnlyList<DrawableHitObject> capturedObjects)
{ {
this.captureArea = captureArea; this.captureArea = captureArea;
this.capturedObjects = capturedObjects; this.capturedObjects = capturedObjects;
@ -66,48 +56,12 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
topLeft -= new Vector2(5); topLeft -= new Vector2(5);
bottomRight += new Vector2(5); bottomRight += new Vector2(5);
FinalSize = bottomRight - topLeft; Size = bottomRight - topLeft;
FinalPosition = topLeft; Position = topLeft;
} }
protected override void PopIn() => this.MoveTo(FinalPosition).ResizeTo(FinalSize).FadeIn(); protected override void PopIn() => this.FadeIn();
protected override void PopOut() => this.FadeOut(); protected override void PopOut() => this.FadeOut();
} }
/// <summary>
/// A <see cref="CaptureBox"/> which fully encloses the <see cref="DrawableHitObject"/>s from the start.
/// </summary>
public class InstantCaptureBox : CaptureBox
{
public InstantCaptureBox(IDrawable captureArea, IReadOnlyList<DrawableHitObject> capturedObjects)
: base(captureArea, capturedObjects)
{
Origin = Anchor.Centre;
}
protected override void PopIn()
=> this.MoveTo(FinalPosition + FinalSize / 2f).ResizeTo(FinalSize).ScaleTo(1.1f)
.Then()
.ScaleTo(1f, 300, Easing.OutQuint).FadeIn(300, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(300, Easing.OutQuint);
}
/// <summary>
/// A <see cref="CaptureBox"/> which moves from an initial position + size to enclose <see cref="DrawableHitObject"/>s.
/// </summary>
public class DragCaptureBox : CaptureBox
{
public DragCaptureBox(IDrawable captureArea, IReadOnlyList<DrawableHitObject> capturedObjects, Vector2 initialPosition, Vector2 initialSize)
: base(captureArea, capturedObjects)
{
Position = initialPosition;
Size = initialSize;
}
protected override void PopIn()
=> this.MoveTo(FinalPosition, 300, Easing.OutQuint).ResizeTo(FinalSize, 300, Easing.OutQuint).FadeIn(300, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(300, Easing.OutQuint);
}
} }

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

@ -52,6 +52,6 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
Size = bottomRight - topLeft; Size = bottomRight - topLeft;
} }
public override void Hide() => this.FadeOut(400, Easing.OutQuint).Expire(); public override void Hide() => this.FadeOut(250, Easing.OutQuint).Expire();
} }
} }

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

@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
protected override bool OnDragEnd(InputState state) protected override bool OnDragEnd(InputState state)
{ {
selectionBox.Hide(); selectionBox.Hide();
finishSelection(true); finishSelection();
return true; return true;
} }
@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
protected override bool OnClick(InputState state) protected override bool OnClick(InputState state)
{ {
selectPoint(state.Mouse.NativeState.Position); selectPoint(state.Mouse.NativeState.Position);
finishSelection(false); finishSelection();
return true; return true;
} }
@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
selectedHitObjects.Add(selected); selectedHitObjects.Add(selected);
} }
private void finishSelection(bool fromDrag) private void finishSelection()
{ {
if (selectedHitObjects.Count == 0) if (selectedHitObjects.Count == 0)
return; return;
@ -111,10 +111,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
// OnDragEnd and OnClick methods within a single frame, OnMouseDown doesn't help us here // OnDragEnd and OnClick methods within a single frame, OnMouseDown doesn't help us here
captureBox?.Hide(); captureBox?.Hide();
if (fromDrag) AddInternal(captureBox = new CaptureBox(this, selectedHitObjects.ToList()));
AddInternal(captureBox = new DragCaptureBox(this, selectedHitObjects.ToList(), selectionBox.Position, selectionBox.Size));
else
AddInternal(captureBox = new InstantCaptureBox(this, selectedHitObjects.ToList()));
} }
} }
} }