X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdrawer.c;h=15879fc36b27903a68c083b6650b7ddef3312538;hb=8cbc895c917357a0dea4b8a8b81ff0920eea66e3;hp=0fc430730ba86ef245866e655714961654fff94a;hpb=6feed80959ad2c11f0427bf0e5a30aab8abd7083;p=swftools.git

diff --git a/lib/drawer.c b/lib/drawer.c
index 0fc4307..15879fc 100644
--- a/lib/drawer.c
+++ b/lib/drawer.c
@@ -57,6 +57,32 @@ void draw_conicTo(drawer_t*draw, FPOINT*  c, FPOINT*  to)
     draw->pos = *to;
 }
 
+/* convenience routine */
+static void draw_conicTo2(drawer_t*draw, double x1, double y1, double  x2, double y2)
+{
+    FPOINT c1,c2;
+    c1.x = x1;
+    c1.y = y1;
+    c2.x = x2;
+    c2.y = y2;
+    draw_conicTo(draw, &c1, &c2);
+}
+/* convenience routine */
+static void draw_moveTo2(drawer_t*draw, double x, double y)
+{
+    FPOINT c;
+    c.x = x; c.y = y;
+    draw->moveTo(draw, &c);
+}
+/* convenience routine */
+static void draw_lineTo2(drawer_t*draw, double x, double y)
+{
+    FPOINT c;
+    c.x = x; c.y = y;
+    draw->lineTo(draw, &c);
+}
+
+
 void draw_string(drawer_t*draw, const char*string)
 {
     const char*p = string;
@@ -64,13 +90,17 @@ void draw_string(drawer_t*draw, const char*string)
 	char*token = getToken(&p);
 	if(!token || !*token) 
 	    break;
-	if(!strncmp(token, "moveTo", 6)) {
+	if(!strncmp(token, "moveTo", 6) ||
+	   !strncmp(token, "M", 1) //svg
+	   ) {
 	    FPOINT to;
 	    to.x = atoi(getToken(&p));
 	    to.y = atoi(getToken(&p));
 	    draw->moveTo(draw, &to);
 	}
-	else if(!strncmp(token, "lineTo", 6)) {
+	else if(!strncmp(token, "lineTo", 6) ||
+	        !strncmp(token, "L", 1) //svg
+	     ) {
 	    FPOINT to;
 	    to.x = atoi(getToken(&p));
 	    to.y = atoi(getToken(&p));
@@ -84,7 +114,41 @@ void draw_string(drawer_t*draw, const char*string)
 	    to.y = atoi(getToken(&p));
 	    draw->splineTo(draw, &mid, &to);
 	}
-	else if(!strncmp(token, "cubicTo", 5)) {
+	else if(!strncmp(token, "conicTo", 5)) {
+	    FPOINT mid,to;
+	    mid.x = atoi(getToken(&p));
+	    mid.y = atoi(getToken(&p));
+	    to.x = atoi(getToken(&p));
+	    to.y = atoi(getToken(&p));
+	    draw_conicTo(draw, &mid, &to);
+	}
+	else if(!strncmp(token, "circle", 6)) {
+	    int mx,my,r;
+	    double r2 = 0.70710678118654757*r;
+	    mx = atoi(getToken(&p));
+	    my = atoi(getToken(&p));
+	    r = atoi(getToken(&p));
+	    draw_moveTo2(draw, mx, my-r);
+	    draw_conicTo2(draw, mx+r2, my-r2, mx+r, my);
+	    draw_conicTo2(draw, mx+r2, my+r2, mx, my+r);
+	    draw_conicTo2(draw, mx-r2, my+r2, mx-r, my);
+	    draw_conicTo2(draw, mx-r2, my-r2, mx, my-r);
+	}
+	else if(!strncmp(token, "box", 3)) {
+	    int x1,y1,x2,y2;
+	    x1 = atoi(getToken(&p));
+	    y1 = atoi(getToken(&p));
+	    x2 = atoi(getToken(&p));
+	    y2 = atoi(getToken(&p));
+	    draw_moveTo2(draw, x1, y1);
+	    draw_lineTo2(draw, x1, y2);
+	    draw_lineTo2(draw, x2, y2);
+	    draw_lineTo2(draw, x2, y1);
+	    draw_lineTo2(draw, x1, y1);
+	}
+	else if(!strncmp(token, "cubicTo", 5) ||
+	        !strncmp(token, "C", 1) //svg
+		) {
 	    FPOINT mid1,mid2,to;
 	    mid1.x = atoi(getToken(&p));
 	    mid1.y = atoi(getToken(&p));
@@ -94,7 +158,12 @@ void draw_string(drawer_t*draw, const char*string)
 	    to.y = atoi(getToken(&p));
 	    draw_cubicTo(draw, &mid1, &mid2, &to);
 	}
-	else fprintf(stderr, "drawer: Warning: unknown primitive '%s'", token);
+	else if(!strncmp(token, "z", 1) //svg
+	       ) {
+	    // ignore
+	}
+	else    
+	    fprintf(stderr, "drawer: Warning: unknown primitive '%s'\n", token);
 	
 	free(token);
     }
@@ -160,6 +229,7 @@ static int approximate3(const struct cspline*s, struct qspline*q, int size, doub
 	char left = 0,recurse=0;
 	int t;
 	int probes = 15;
+	double dx,dy;
 
 	/* create simple approximation: a qspline which run's through the
 	   qspline point at 0.5 */
@@ -194,8 +264,9 @@ static int approximate3(const struct cspline*s, struct qspline*q, int size, doub
 	    test.control.y += test.end.y;
 	}
 
+#define PROBES
+#ifdef PROBES
 	/* measure the spline's accurancy, by taking a number of probes */
-
 	for(t=0;t<probes;t++) {
 	    struct SPLINEPOINT qr1,qr2,cr1,cr2;
 	    double pos = 0.5/(probes*2)*(t*2+1);
@@ -222,6 +293,22 @@ static int approximate3(const struct cspline*s, struct qspline*q, int size, doub
 		recurse=1;break;
 	    }
 	}
+#else // quadratic error: *much* faster!
+
+	/* 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;
+	
+	/* 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)
+	 */
+	recurse = (dx*dx + dy*dy > quality2);
+#endif
 
 	if(recurse && istep>1 && size-level > num) {
 	    istep >>= 1;