X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxtools.c;h=ec986097b9dd7f1b63de2e8a817b395b70710810;hb=59c449f6c4adf1296f0aa55196a7a9440eaec721;hp=e0750595bc52921c71cf813c931ceec06b349ba4;hpb=9d1556507170bc827fca8ebbaa27862c978c6c33;p=swftools.git

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index e075059..ec98609 100644
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -37,6 +37,12 @@ static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
     linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
     gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
     l->type = gfx_moveTo;
+    if((int)((d->x * 5120) == (int)(x * 5120)) &&
+       (int)((d->y * 5120) == (int)(y * 5120))) {
+	/* never mind- we're already there */
+	return;
+
+    }
     d->x = l->x = x;
     d->y = l->y = y;
     l->next = 0;
@@ -274,6 +280,25 @@ void gfxtool_draw_dashed_line(gfxdrawer_t*d, gfxline_t*line, float*r, float phas
     }
 }
 
+gfxline_t * gfxline_clone(gfxline_t*line)
+{
+    gfxline_t*dest = 0;
+    gfxline_t*pos = 0;
+    while(line) {
+	gfxline_t*n = rfx_calloc(sizeof(gfxline_t));
+	*n = *line;
+	n->next = 0;
+	if(!pos) {
+	    dest = pos = n;
+	} else {
+	    pos->next = n;
+	    pos = n;
+	}
+	line = line->next;
+    }
+    return dest;
+}
+
 gfxline_t* gfxtool_dash_line(gfxline_t*line, float*dashes, float phase)
 {
     gfxdrawer_t d;
@@ -386,7 +411,7 @@ static int approximate3(const cspline_t*s, qspline_t*q, int size, double quality
 	    test.control.y += test.end.y;
 	}
 
-#define PROBES
+//#define PROBES
 #ifdef PROBES
 	/* measure the spline's accurancy, by taking a number of probes */
 	for(t=0;t<probes;t++) {
@@ -419,16 +444,21 @@ static int approximate3(const cspline_t*s, qspline_t*q, int size, double quality
 
 	/* convert control point representation to 
 	   d*x^3 + c*x^2 + b*x + a */
-
-	/* FIXME: we need to do this for the subspline between [start,end],
-	   not [0,1] */
 	dx= s->end.x  - s->control2.x*3 + s->control1.x*3 - s->start.x;
 	dy= s->end.y  - s->control2.y*3 + s->control1.y*3 - s->start.y;
 	
+	/* we need to do this for the subspline between [start,end], not [0,1] 
+	   as a transformation of t->a*t+b does nothing to highest coefficient
+	   of the spline except multiply it with a^3, we just need to modify
+	   d here. */
+	{double m = end-start;
+	 dx*=m*m*m;
+	 dy*=m*m*m;
+	}
+	
 	/* use the integral over (f(x)-g(x))^2 between 0 and 1
 	   to measure the approximation quality. 
-	   (it boils down to const*d^2)
-	 */
+	   (it boils down to const*d^2) */
 	recurse = (dx*dx + dy*dy > quality2);
 #endif
 
@@ -448,11 +478,21 @@ static int approximate3(const cspline_t*s, qspline_t*q, int size, double quality
     return num;
 }
 
+void gfxdraw_conicTo(gfxdrawer_t*draw, double cx, double cy, double tox, double toy)
+{
+    double c1x = (draw->x + 2 * cx) / 3;
+    double c1y = (draw->y + 2 * cy) / 3;
+    double c2x = (2 * cx + tox) / 3;
+    double c2y = (2 * cy + toy) / 3;
+    gfxdraw_cubicTo(draw, c1x, c1y, c2x, c2y, tox, toy);
+}
+
+
 void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, double c2y, double x, double y)
 {
     qspline_t q[128];
     cspline_t c;
-    double maxerror = 0.04;
+    double maxerror = 0.01;
     int t,num;
 
     c.start.x = draw->x;
@@ -464,11 +504,11 @@ void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, doubl
     c.end.x = x;
     c.end.y = y;
     
-    num = approximate3(&c, q, 128, maxerror*maxerror);
+    num = approximate3(&c, q, 128, maxerror);
 
     for(t=0;t<num;t++) {
-	FPOINT mid;
-	FPOINT to;
+	gfxpoint_t mid;
+	gfxpoint_t to;
 	mid.x = q[t].control.x;
 	mid.y = q[t].control.y;
 	to.x = q[t].end.x;
@@ -479,7 +519,7 @@ void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, doubl
 
 gfxbbox_t gfxbbox_expand_to_point(gfxbbox_t box, gfxcoord_t x, gfxcoord_t y)
 {
-    if(box.xmin==0 || box.ymin==0 || box.xmax==0 || box.ymax==0) {
+    if(box.xmin==0 && box.ymin==0 && box.xmax==0 && box.ymax==0) {
 	box.xmin = x;
 	box.ymin = y;
 	box.xmax = x;
@@ -517,23 +557,57 @@ gfxbbox_t gfxline_getbbox(gfxline_t*line)
 	    last = 0;
 	}
 	x = line->x;
-	y = line->x;
+	y = line->y;
 	line = line->next;
     }
     return bbox;
 }
 
-void gfxline_dump(gfxline_t*line, FILE*fi)
+void gfxline_dump(gfxline_t*line, FILE*fi, char*prefix)
 {
     while(line) {
 	if(line->type == gfx_moveTo) {
-	    fprintf(fi, "moveTo %.2f %.2f\n", line->x, line->y);
+	    fprintf(fi, "%smoveTo %.2f %.2f\n", prefix, line->x, line->y);
 	} else if(line->type == gfx_lineTo) {
-	    fprintf(fi, "lineTo %.2f %.2f\n", line->x, line->y);
+	    fprintf(fi, "%slineTo %.2f %.2f\n", prefix, line->x, line->y);
 	} else if(line->type == gfx_splineTo) {
-	    fprintf(fi, "splineTo (%.2f %.2f) %.2f %.2f\n", line->sx, line->sy, line->x, line->y);
+	    fprintf(fi, "%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix, line->sx, line->sy, line->x, line->y);
+	}
+	line = line->next;
+    }
+}
+
+gfxline_t* gfxline_append(gfxline_t*line1, gfxline_t*line2)
+{
+    gfxline_t*l = line1;;
+    if(!l)
+	return line2;
+    while(l->next) {
+	l = l->next;
+    }
+    l->next = line2;
+    return line1;
+}
+
+void gfxline_transform(gfxline_t*line, gfxmatrix_t*matrix)
+{
+    while(line) {
+	double x = matrix->m00*line->x + matrix->m10*line->y + matrix->tx;
+	double y = matrix->m01*line->x + matrix->m11*line->y + matrix->ty;
+	line->x = x;
+	line->y = y;
+	if(line->type == gfx_splineTo) {
+	    double sx = matrix->m00*line->sx + matrix->m10*line->sy + matrix->tx;
+	    double sy = matrix->m01*line->sx + matrix->m11*line->sy + matrix->ty;
+	    line->sx = sx;
+	    line->sy = sy;
 	}
 	line = line->next;
     }
 }
 
+void gfxmatrix_dump(gfxmatrix_t*m, FILE*fi, char*prefix)
+{
+    fprintf(fi, "%f %f | %f\n", m->m00, m->m10, m->tx);
+    fprintf(fi, "%f %f | %f\n", m->m01, m->m11, m->ty);
+}