aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move all segment parts draw into a single place

Browse Source
This commit is contained in:
Andrei Zavatski
2025-12-09 01:44:36 +03:00
parent 30a2a349ac
commit 3581793fd7
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Framework/Graphics/Lines/Path_DrawNode.cs
View File

@@ -83,9 +83,24 @@ namespace osu.Framework.Graphics.Lines
/// Draws the provided segment to the screen.
/// </summary>
/// <param name="segment">The segment to be drawn.</param>
/// <param name="prevSegment">Previous segment.</param>
/// <param name="location">Position of the segment relative to the previous one.</param>
/// <param name="endCap">Whether end cap of this segment must be drawn.</param>
private void drawSegment(DrawableSegment segment, bool endCap)
private void drawSegment(DrawableSegment segment, DrawableSegment prevSegment, SegmentStartLocation location, bool endCap)
{
switch (location)
{
// Segment starts at the end of the previous one
case SegmentStartLocation.End:
drawConnectionBetween(segment, prevSegment);
break;
// Segment starts outside the previous one, nothing is being connected to the start of the segment - start cap is required.
case SegmentStartLocation.Outside:
drawStartCap(segment);
break;
}
drawQuad
(
segment.DrawQuad,
@@ -271,8 +286,7 @@ namespace osu.Framework.Graphics.Lines
{
DrawableSegment s = new DrawableSegment(segmentToDraw, radius);
// if next segment starts at the start or the middle of the current one, nothing will be connected to the end of the current segment - end cap is required.
drawSegment(s, nextLocation == SegmentStartLocation.StartOrMiddle);
drawStartPart(s, lastDrawnSegment, location);
drawSegment(s, lastDrawnSegment, location, nextLocation == SegmentStartLocation.StartOrMiddle);
lastDrawnSegment = s;
segmentToDraw = segments[i];
@@ -282,28 +296,7 @@ namespace osu.Framework.Graphics.Lines
}
// Finish drawing last segment
DrawableSegment last = new DrawableSegment(segmentToDraw, radius);
drawStartPart(last, lastDrawnSegment, location);
drawSegment(last, true);
}
/// <summary>
/// Draws start cap or connection between segments when required.
/// </summary>
private void drawStartPart(DrawableSegment segment, DrawableSegment prevSegment, SegmentStartLocation location)
{
switch (location)
{
// Segment starts at the end of the previous one
case SegmentStartLocation.End:
drawConnectionBetween(segment, prevSegment);
return;
// Segment starts outside the previous one, nothing is being connected to the start of the segment - start cap is required.
case SegmentStartLocation.Outside:
drawStartCap(segment);
return;
}
drawSegment(new DrawableSegment(segmentToDraw, radius), lastDrawnSegment, location, true);
}
private void drawEndCap(DrawableSegment segment)