RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish up logical implementation of markers

This commit is contained in:
smoogipoo 2017-12-11 21:03:34 +09:00
parent 5147b342dc
commit 25d80a36be
1 changed files with 123 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
osu.Game/Rulesets/Edit/SelectionLayer.cs
View File

@ -84,24 +84,36 @@ public DragContainer(Vector2 startPos)
InternalChildren = new Drawable[]
{
borderMask = new Container
new Container
{
RelativeSizeAxes = Axes.Both,
Masking = true,
BorderColour = Color4.White,
BorderThickness = 2,
MaskingSmoothness = 1,
Child = background = new Box
Padding = new MarginPadding(-1),
Child = borderMask = new Container
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.1f,
AlwaysPresent = true
},
Masking = true,
BorderColour = Color4.White,
BorderThickness = 2,
MaskingSmoothness = 1,
Child = background = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0.1f,
AlwaysPresent = true
},
}
},
markers = new MarkerContainer
{
RelativeSizeAxes = Axes.Both,
Alpha = 0
Alpha = 0,
GetCaptureRectangle = () => trackingRectangle,
UpdateCapture = r =>
{
trackRectangle(r);
UpdateCapture();
},
FinishCapture = FinishCapture
}
};
}
@ -112,16 +124,20 @@ private void load(OsuColour colours)
captureFinishedColour = colours.Yellow;
}
public void Track(Vector2 position)
{
var trackingRectangle = RectangleF.FromLTRB(
Math.Min(startPos.X, position.X),
Math.Min(startPos.Y, position.Y),
Math.Max(startPos.X, position.X),
Math.Max(startPos.Y, position.Y));
public void Track(Vector2 position) => trackRectangle(RectangleF.FromLTRB(startPos.X, startPos.Y, position.X, position.Y));
Position = trackingRectangle.Location;
Size = trackingRectangle.Size;
private RectangleF trackingRectangle;
private void trackRectangle(RectangleF rectangle)
{
trackingRectangle = rectangle;
Position = new Vector2(
Math.Min(rectangle.Left, rectangle.Right),
Math.Min(rectangle.Top, rectangle.Bottom));
Size = new Vector2(
Math.Max(rectangle.Left, rectangle.Right) - Position.X,
Math.Max(rectangle.Top, rectangle.Bottom) - Position.Y);
}
private List<DrawableHitObject> capturedHitObjects = new List<DrawableHitObject>();
@ -144,6 +160,12 @@ public void UpdateCapture()
public void FinishCapture()
{
if (CapturedHitObjects.Count == 0)
{
Hide();
return;
}
// Move the rectangle to cover the hitobjects
var topLeft = new Vector2(float.MaxValue, float.MaxValue);
var bottomRight = new Vector2(float.MinValue, float.MinValue);
@ -158,10 +180,12 @@ public void FinishCapture()
bottomRight += new Vector2(5);
this.MoveTo(topLeft, 200, Easing.OutQuint)
.ResizeTo(bottomRight - topLeft, 200, Easing.OutQuint)
.FadeColour(captureFinishedColour, 200);
.ResizeTo(bottomRight - topLeft, 200, Easing.OutQuint);
trackingRectangle = RectangleF.FromLTRB(topLeft.X, topLeft.Y, bottomRight.X, bottomRight.Y);
borderMask.BorderThickness = 3;
borderMask.FadeColour(captureFinishedColour, 200);
background.Delay(50).FadeOut(200);
markers.FadeIn(200);
@ -179,12 +203,12 @@ public override void Hide()
public class MarkerContainer : CompositeDrawable
{
public Action<RectangleF> ResizeRequested;
public Func<RectangleF> GetCaptureRectangle;
public Action<RectangleF> UpdateCapture;
public Action FinishCapture;
public MarkerContainer()
{
Padding = new MarginPadding(1);
InternalChildren = new Drawable[]
{
new Marker
@ -193,31 +217,62 @@ public MarkerContainer()
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.TopRight,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.CentreRight,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.BottomRight,
Origin = Anchor.Centre
},
new Marker
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre
},
new CentreMarker
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
}
};
InternalChildren.OfType<Marker>().ForEach(m =>
{
m.GetCaptureRectangle = () => GetCaptureRectangle();
m.UpdateCapture = r => UpdateCapture(r);
m.FinishCapture = () => FinishCapture();
});
}
}
public class Marker : CompositeDrawable
{
public Func<RectangleF> GetCaptureRectangle;
public Action<RectangleF> UpdateCapture;
public Action FinishCapture;
private float marker_size = 10;
public Marker()
@ -231,6 +286,44 @@ public Marker()
Child = new Box { RelativeSizeAxes = Axes.Both }
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Colour = colours.Yellow;
}
protected override bool OnDragStart(InputState state) => true;
protected override bool OnDrag(InputState state)
{
var currentRectangle = GetCaptureRectangle();
float left = currentRectangle.Left;
float right = currentRectangle.Right;
float top = currentRectangle.Top;
float bottom = currentRectangle.Bottom;
// Apply modifications to the capture rectangle
if ((Anchor & Anchor.y0) > 0)
top += state.Mouse.Delta.Y;
else if ((Anchor & Anchor.y2) > 0)
bottom += state.Mouse.Delta.Y;
if ((Anchor & Anchor.x0) > 0)
left += state.Mouse.Delta.X;
else if ((Anchor & Anchor.x2) > 0)
right += state.Mouse.Delta.X;
UpdateCapture(RectangleF.FromLTRB(left, top, right, bottom));
return true;
}
protected override bool OnDragEnd(InputState state)
{
FinishCapture();
return true;
}
}
public class CentreMarker : CompositeDrawable
@ -260,5 +353,11 @@ public CentreMarker()
},
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Colour = colours.Yellow;
}
}
}