Handle axial and radial shadings the same way as other shadings.

1 files changed, 7 insertions, 193 deletions

diff --git a/draw/draw_mesh.c b/draw/draw_mesh.c
index 532f78f4..885a6944 100644
--- a/draw/draw_mesh.c
+++ b/draw/draw_mesh.c
@@ -448,184 +448,6 @@ fz_paint_triangle(fz_pixmap *pix, float *av, float *bv, float *cv, int n, fz_bbo
 	}
 }
 
-static void
-fz_paint_quad(fz_pixmap *pix,
-		fz_point p0, fz_point p1, fz_point p2, fz_point p3,
-		float c0, float c1, float c2, float c3,
-		int n, fz_bbox bbox)
-{
-	float v[4][3];
-
-	v[0][0] = p0.x;
-	v[0][1] = p0.y;
-	v[0][2] = c0;
-
-	v[1][0] = p1.x;
-	v[1][1] = p1.y;
-	v[1][2] = c1;
-
-	v[2][0] = p2.x;
-	v[2][1] = p2.y;
-	v[2][2] = c2;
-
-	v[3][0] = p3.x;
-	v[3][1] = p3.y;
-	v[3][2] = c3;
-
-	fz_paint_triangle(pix, v[0], v[2], v[3], n, bbox);
-	fz_paint_triangle(pix, v[0], v[3], v[1], n, bbox);
-}
-
-/*
- * linear, radial and mesh painting
- */
-
-#define HUGENUM 32000 /* how far to extend axial/radial shadings */
-#define RADSEGS 32 /* how many segments to generate for radial meshes */
-
-static fz_point
-fz_point_on_circle(fz_point p, float r, float theta)
-{
-	p.x = p.x + my_cosf(theta) * r;
-	p.y = p.y + my_sinf(theta) * r;
-
-	return p;
-}
-
-static void
-fz_paint_linear(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox)
-{
-	fz_point p0, p1;
-	fz_point v0, v1, v2, v3;
-	fz_point e0, e1;
-	float theta;
-
-	p0.x = shade->u.a_or_r.coords[0][0];
-	p0.y = shade->u.a_or_r.coords[0][1];
-	p0 = fz_transform_point(ctm, p0);
-
-	p1.x = shade->u.a_or_r.coords[1][0];
-	p1.y = shade->u.a_or_r.coords[1][1];
-	p1 = fz_transform_point(ctm, p1);
-
-	theta = my_atan2f(p1.y - p0.y, p1.x - p0.x);
-	theta += (float)M_PI * 0.5f;
-
-	v0 = fz_point_on_circle(p0, HUGENUM, theta);
-	v1 = fz_point_on_circle(p1, HUGENUM, theta);
-	v2 = fz_point_on_circle(p0, -HUGENUM, theta);
-	v3 = fz_point_on_circle(p1, -HUGENUM, theta);
-
-	fz_paint_quad(dest, v0, v1, v2, v3, 0, 255, 0, 255, 3, bbox);
-
-	if (shade->u.a_or_r.extend[0])
-	{
-		e0.x = v0.x - (p1.x - p0.x) * HUGENUM;
-		e0.y = v0.y - (p1.y - p0.y) * HUGENUM;
-
-		e1.x = v2.x - (p1.x - p0.x) * HUGENUM;
-		e1.y = v2.y - (p1.y - p0.y) * HUGENUM;
-
-		fz_paint_quad(dest, e0, e1, v0, v2, 0, 0, 0, 0, 3, bbox);
-	}
-
-	if (shade->u.a_or_r.extend[1])
-	{
-		e0.x = v1.x + (p1.x - p0.x) * HUGENUM;
-		e0.y = v1.y + (p1.y - p0.y) * HUGENUM;
-
-		e1.x = v3.x + (p1.x - p0.x) * HUGENUM;
-		e1.y = v3.y + (p1.y - p0.y) * HUGENUM;
-
-		fz_paint_quad(dest, e0, e1, v1, v3, 255, 255, 255, 255, 3, bbox);
-	}
-}
-
-static void
-fz_paint_annulus(fz_matrix ctm,
-		fz_point p0, float r0, float c0,
-		fz_point p1, float r1, float c1,
-		fz_pixmap *dest, fz_bbox bbox)
-{
-	fz_point t0, t1, t2, t3, b0, b1, b2, b3;
-	float theta, step;
-	int i;
-
-	theta = my_atan2f(p1.y - p0.y, p1.x - p0.x);
-	step = (float)M_PI * 2 / RADSEGS;
-
-	for (i = 0; i < RADSEGS / 2; i++)
-	{
-		t0 = fz_point_on_circle(p0, r0, theta + i * step);
-		t1 = fz_point_on_circle(p0, r0, theta + i * step + step);
-		t2 = fz_point_on_circle(p1, r1, theta + i * step);
-		t3 = fz_point_on_circle(p1, r1, theta + i * step + step);
-		b0 = fz_point_on_circle(p0, r0, theta - i * step);
-		b1 = fz_point_on_circle(p0, r0, theta - i * step - step);
-		b2 = fz_point_on_circle(p1, r1, theta - i * step);
-		b3 = fz_point_on_circle(p1, r1, theta - i * step - step);
-
-		t0 = fz_transform_point(ctm, t0);
-		t1 = fz_transform_point(ctm, t1);
-		t2 = fz_transform_point(ctm, t2);
-		t3 = fz_transform_point(ctm, t3);
-		b0 = fz_transform_point(ctm, b0);
-		b1 = fz_transform_point(ctm, b1);
-		b2 = fz_transform_point(ctm, b2);
-		b3 = fz_transform_point(ctm, b3);
-
-		fz_paint_quad(dest, t0, t1, t2, t3, c0, c0, c1, c1, 3, bbox);
-		fz_paint_quad(dest, b0, b1, b2, b3, c0, c0, c1, c1, 3, bbox);
-	}
-}
-
-static void
-fz_paint_radial(fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox)
-{
-	fz_point p0, p1;
-	float r0, r1;
-	fz_point e;
-	float er, rs;
-
-	p0.x = shade->u.a_or_r.coords[0][0];
-	p0.y = shade->u.a_or_r.coords[0][1];
-	r0 = shade->u.a_or_r.coords[0][2];
-
-	p1.x = shade->u.a_or_r.coords[1][0];
-	p1.y = shade->u.a_or_r.coords[1][1];
-	r1 = shade->u.a_or_r.coords[1][2];
-
-	if (shade->u.a_or_r.extend[0])
-	{
-		if (r0 < r1)
-			rs = r0 / (r0 - r1);
-		else
-			rs = -HUGENUM;
-
-		e.x = p0.x + (p1.x - p0.x) * rs;
-		e.y = p0.y + (p1.y - p0.y) * rs;
-		er = r0 + (r1 - r0) * rs;
-
-		fz_paint_annulus(ctm, e, er, 0, p0, r0, 0, dest, bbox);
-	}
-
-	fz_paint_annulus(ctm, p0, r0, 0, p1, r1, 255, dest, bbox);
-
-	if (shade->u.a_or_r.extend[1])
-	{
-		if (r0 > r1)
-			rs = r1 / (r1 - r0);
-		else
-			rs = -HUGENUM;
-
-		e.x = p1.x + (p0.x - p1.x) * rs;
-		e.y = p1.y + (p0.y - p1.y) * rs;
-		er = r1 + (r0 - r1) * rs;
-
-		fz_paint_annulus(ctm, p1, r1, 255, e, er, 255, dest, bbox);
-	}
-}
-
 struct paint_tri_data
 {
 	fz_context *ctx;
@@ -679,6 +501,7 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm, fz_pixmap *dest,
 	fz_pixmap *temp = NULL;
 	fz_pixmap *conv = NULL;
 	float color[FZ_MAX_COLORS];
+	struct paint_tri_data ptd;
 	int i, k;
 
 	fz_var(temp);
@@ -706,21 +529,12 @@ fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm, fz_pixmap *dest,
 			temp = dest;
 		}
 
-		switch (shade->type)
-		{
-		case FZ_LINEAR: fz_paint_linear(shade, ctm, temp, bbox); break;
-		case FZ_RADIAL: fz_paint_radial(shade, ctm, temp, bbox); break;
-		default:
-		{
-			struct paint_tri_data ptd;
-			ptd.ctx = ctx;
-			ptd.dest = temp;
-			ptd.shade = shade;
-			ptd.bbox = bbox;
-			fz_process_mesh(ctx, shade, ctm, &do_paint_tri, &ptd);
-			break;
-		}
-		}
+		ptd.ctx = ctx;
+		ptd.dest = temp;
+		ptd.shade = shade;
+		ptd.bbox = bbox;
+
+		fz_process_mesh(ctx, shade, ctm, &do_paint_tri, &ptd);
 
 		if (shade->use_function)
 		{