Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

circle contour: Fix reverse segments

Browse Source 
Just turn them into a standard contour.
This commit is contained in:
Matthias Clasen
2023-07-05 00:27:39 -04:00
parent 284a2c214f
commit 7404dc8999
1 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gsk/gskcontour.c
View File

@@ -842,6 +842,47 @@ gsk_circle_contour_copy (const GskContour *contour,
*target = *self;
}
static gboolean
add_segment (GskPathOperation op,
const graphene_point_t *pts,
gsize n_pts,
float weight,
gpointer data)
{
GskPathBuilder *builder = data;
switch (op)
{
case GSK_PATH_LINE:
gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
break;
case GSK_PATH_QUAD:
gsk_path_builder_quad_to (builder, pts[1].x, pts[1].y,
pts[2].x, pts[2].y);
break;
case GSK_PATH_CUBIC:
gsk_path_builder_cubic_to (builder, pts[1].x, pts[1].y,
pts[2].x, pts[2].y,
pts[3].x, pts[3].y);
break;
case GSK_PATH_CONIC:
gsk_path_builder_conic_to (builder, pts[1].x, pts[1].y,
pts[2].x, pts[2].y,
weight);
break;
case GSK_PATH_MOVE:
case GSK_PATH_CLOSE:
default:
g_assert_not_reached ();
}
return TRUE;
}
static void
gsk_circle_contour_add_segment (const GskContour *contour,
GskPathBuilder *builder,
@@ -851,17 +892,29 @@ gsk_circle_contour_add_segment (const GskContour *contour,
float end)
{
const GskCircleContour *self = (const GskCircleContour *) contour;
if (emit_move_to)
{
float delta = self->end_angle - self->start_angle;
float length = self->radius * DEG_TO_RAD (delta);
GskContour *segment;
if (!emit_move_to)
g_warning ("FIXME: somebody needs to decompose contours into segments differently");
segment = gsk_circle_contour_new (&self->center, self->radius,
self->start_angle + start/length * delta,
self->start_angle + end/length * delta);
gsk_path_builder_add_contour (builder, segment);
}
else
{
gsk_spline_decompose_arc (&self->center,
self->radius,
GSK_PATH_TOLERANCE_DEFAULT,
DEG_TO_RAD (self->end_angle),
DEG_TO_RAD (self->start_angle),
gsk_circle_contour_curve,
&(ForeachWrapper) { add_segment, builder });
}
}
static int
gsk_circle_contour_get_winding (const GskContour *contour,