X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fconvert.c;h=f67699ed76458dee9ece58437b59dfe06c39ad8a;hp=9cd560c9dbd0b12b269a686edb8bc1075c379f7c;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=ae2bbf404cbdf63152d22f1b0824468d04f8f8ce

diff --git a/lib/gfxpoly/convert.c b/lib/gfxpoly/convert.c
index 9cd560c..f67699e 100644
--- a/lib/gfxpoly/convert.c
+++ b/lib/gfxpoly/convert.c
@@ -5,18 +5,20 @@
 #include "../mem.h"
 #include "poly.h"
 #include "convert.h"
+#include "wind.h"
 
 /* factor that determines into how many line fragments a spline is converted */
 #define SUBFRACTION (2.4)
 
 static inline int32_t convert_coord(double x, double z)
 {
-    /* we clamp to 31 bit instead of 32 bit because we use
-       a (x1-x2) shortcut when comparing coordinates
+    /* we clamp to 26 bit because: 
+       a) we use a (x1-x2) shortcut when comparing coordinates
+       b) we need to be able to multiply two coordinates and store them in a double w/o loss of precision
     */
     x *= z;
-    if(x < -0x40000000) x = -0x40000000;
-    if(x >  0x3fffffff) x =  0x3fffffff;
+    if(x < -0x2000000) x = -0x2000000;
+    if(x >  0x1ffffff) x =  0x1ffffff;
     return ceil(x);
 }
 
@@ -90,7 +92,7 @@ static void convert_file(const char*filename, polywriter_t*w, double gridsize)
             break;
         double x,y;
         char s[256];
-        if(sscanf(line, "%lf %lf %s", &x, &y, &s) == 3) {
+        if(sscanf(line, "%lf %lf %s", &x, &y, (char*)&s) == 3) {
             if(s && !strcmp(s,"moveto")) {
 		w->moveto(w, convert_coord(x,z), convert_coord(y,z));
                 count++;
@@ -133,7 +135,7 @@ void finish_segment(compactpoly_t*data)
     gfxpolystroke_t*s = rfx_calloc(sizeof(gfxpolystroke_t));
     s->next = data->poly->strokes;
     data->poly->strokes = s;
-    s->num_points = data->num_points;
+    s->num_points = s->points_size = data->num_points;
     s->dir = data->dir;
     s->points = p;
     assert(data->dir != DIR_UNKNOWN);
@@ -173,9 +175,8 @@ static void compactlineto(polywriter_t*w, int32_t x, int32_t y)
     if(p.x == data->last.x && p.y == data->last.y)
 	return;
 
-    if(p.y < data->last.y && data->dir != DIR_UP ||
-       p.y > data->last.y && data->dir != DIR_DOWN || 
-       data->new) {
+    if((p.y < data->last.y && data->dir != DIR_UP) ||
+       (p.y > data->last.y && data->dir != DIR_DOWN) || data->new) {
 	finish_segment(data);
 	data->dir = p.y > data->last.y ? DIR_DOWN : DIR_UP;
 	data->points[0] = data->last;
@@ -230,7 +231,7 @@ void gfxpolywriter_init(polywriter_t*w)
     data->poly->strokes = 0;
 }
 
-gfxpoly_t* gfxpoly_from_gfxline(gfxline_t*line, double gridsize)
+gfxpoly_t* gfxpoly_from_fill(gfxline_t*line, double gridsize)
 {
     polywriter_t writer;
     gfxpolywriter_init(&writer);
@@ -259,3 +260,280 @@ void gfxpoly_destroy(gfxpoly_t*poly)
     free(poly);
 }
 
+typedef struct _polydraw_internal
+{
+    double lx, ly;
+    int32_t lastx, lasty;
+    int32_t x0, y0;
+    double z;
+    char last;
+    polywriter_t writer;
+} polydraw_internal_t;
+
+static void polydraw_moveTo(gfxdrawer_t*d, gfxcoord_t _x, gfxcoord_t _y)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)d->internal;
+    int32_t x = convert_coord(_x, i->z);
+    int32_t y = convert_coord(_y, i->z);
+    if(i->lastx != x || i->lasty != y) {
+	i->writer.moveto(&i->writer, x, y);
+    }
+    i->lx = _x;
+    i->ly = _y;
+    i->x0 = x;
+    i->y0 = y;
+    i->lastx = x;
+    i->lasty = y;
+    i->last = 1;
+}
+static void polydraw_lineTo(gfxdrawer_t*d, gfxcoord_t _x, gfxcoord_t _y)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)d->internal;
+    if(!i->last) {
+	polydraw_moveTo(d, _x, _y);
+	return;
+    }
+    int32_t x = convert_coord(_x, i->z);
+    int32_t y = convert_coord(_y, i->z);
+    if(i->lastx != x || i->lasty != y) {
+	i->writer.lineto(&i->writer, x, y);
+    }
+    i->lx = _x;
+    i->ly = _y;
+    i->lastx = x;
+    i->lasty = y;
+    i->last = 1;
+}
+static void polydraw_splineTo(gfxdrawer_t*d, gfxcoord_t sx, gfxcoord_t sy, gfxcoord_t x, gfxcoord_t y)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)d->internal;
+    if(!i->last) {
+	polydraw_moveTo(d, x, y);
+	return;
+    }
+    double c = fabs(x-2*sx+i->lx) + fabs(y-2*sy+i->ly);
+    int parts = (int)(sqrt(c)*SUBFRACTION);
+    if(!parts) parts = 1;
+    int t;
+    int32_t nx,ny;
+    for(t=0;t<parts;t++) {
+	nx = convert_coord((double)(t*t*x + 2*t*(parts-t)*sx + (parts-t)*(parts-t)*i->lx)/(double)(parts*parts), i->z);
+	ny = convert_coord((double)(t*t*y + 2*t*(parts-t)*sy + (parts-t)*(parts-t)*i->ly)/(double)(parts*parts), i->z);
+	if(nx != i->lastx || ny != i->lasty) {
+	    i->writer.lineto(&i->writer, nx, ny);
+	    i->lastx = nx; i->lasty = ny;
+	}
+    }
+    nx = convert_coord(x,i->z);
+    ny = convert_coord(y,i->z);
+    if(nx != i->lastx || ny != i->lasty) {
+	i->writer.lineto(&i->writer, nx, ny);
+    }
+    i->lx = x;
+    i->ly = y;
+    i->lastx = nx; 
+    i->lasty = ny;
+    i->last = 1;
+}
+static void polydraw_close(gfxdrawer_t*d)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)d->internal;
+    assert(!(i->last && (i->x0 == INVALID_COORD || i->y0 == INVALID_COORD)));
+    if(!i->last)
+	return;
+    if(i->lastx != i->x0 || i->lasty != i->y0) {
+	i->writer.lineto(&i->writer, i->x0, i->y0);
+	i->lastx = i->x0;
+	i->lasty = i->y0;
+    }
+    i->last = 0;
+    i->x0 = INVALID_COORD;
+    i->y0 = INVALID_COORD;
+}
+static void* polydraw_result(gfxdrawer_t*d)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)d->internal;
+    void*result = i->writer.finish(&i->writer);
+    rfx_free(i);
+    memset(d, 0, sizeof(gfxdrawer_t));
+    return result;
+}
+
+void gfxdrawer_target_poly(gfxdrawer_t*d, double gridsize)
+{
+    polydraw_internal_t*i = (polydraw_internal_t*)rfx_calloc(sizeof(polydraw_internal_t));
+    d->internal = i;
+    i->lastx = INVALID_COORD; // convert_coord can never return this value
+    i->lasty = INVALID_COORD;
+    i->x0 = INVALID_COORD;
+    i->y0 = INVALID_COORD;
+    d->moveTo = polydraw_moveTo;
+    d->lineTo = polydraw_lineTo;
+    d->splineTo = polydraw_splineTo;
+    d->close = polydraw_close;
+    d->result = polydraw_result;
+    gfxpolywriter_init(&i->writer);
+    i->writer.setgridsize(&i->writer, gridsize);
+    i->z = 1.0 / gridsize;
+}
+
+#if 0
+gfxline_t*gfxline_from_gfxpoly(gfxpoly_t*poly)
+{
+    gfxpolystroke_t*stroke;
+    int count = 0;
+    for(stroke=poly->strokes;stroke;stroke=stroke->next) {
+	assert(stroke->num_points);
+	count += stroke->num_points;
+    }
+    if(!count) return 0;
+    gfxline_t*l = malloc(sizeof(gfxline_t)*count);
+    count = 0;
+    /* TODO: it might make sense to concatenate strokes */
+    for(stroke=poly->strokes;stroke;stroke=stroke->next) {
+	int t;
+	for(t=0;t<stroke->num_points;t++) {
+	    l[count+t].x = stroke->points[t].x * poly->gridsize;
+	    l[count+t].y = stroke->points[t].y * poly->gridsize;
+	    l[count+t].type = gfx_lineTo;
+	    l[count+t].next = &l[count+t+1];
+	}
+	l[count].type = gfx_moveTo;
+	count+=stroke->num_points;
+    }
+    l[count-1].next = 0;
+    return l;
+}
+#endif
+
+static gfxline_t*mkgfxline(gfxpoly_t*poly, char preserve_direction)
+{
+    gfxpolystroke_t*stroke;
+    int count = 0;
+    if(!poly->strokes)
+	return 0;
+    dict_t*d = dict_new2(&point_type);
+    dict_t*todo = dict_new2(&ptr_type);
+    gfxpolystroke_t*stroke_min= poly->strokes;
+    int32_t x_min=stroke_min->points[0].x;
+    int32_t y_min=stroke_min->points[0].y;
+    for(stroke=poly->strokes;stroke;stroke=stroke->next) {
+	dict_put(todo, stroke, stroke);
+	assert(stroke->num_points>1);
+	count += stroke->num_points;
+	if(stroke->dir == DIR_UP) {
+	    dict_put(d, &stroke->points[stroke->num_points-1], stroke);
+	    if(!preserve_direction)
+		dict_put(d, &stroke->points[0], stroke);
+	} else {
+	    dict_put(d, &stroke->points[0], stroke);
+	    if(!preserve_direction)
+		dict_put(d, &stroke->points[stroke->num_points-1], stroke);
+	}
+	if(stroke->points[0].y < y_min ||
+	   (stroke->points[0].y == y_min && stroke->points[0].x < x_min)) {
+	    y_min = stroke->points[0].y;
+	    stroke_min = stroke;
+	}
+    }
+    gfxpolystroke_t*next_todo = poly->strokes;
+    gfxline_t*l = malloc(sizeof(gfxline_t)*count);
+    count = 0;
+    stroke = stroke_min;
+    
+    point_t last = {INVALID_COORD, INVALID_COORD};
+    char should_connect = 0;
+    while(stroke) {
+	if(stroke && !preserve_direction) {
+	    char del1 = dict_del2(d, &stroke->points[0], stroke);
+	    char del2 = dict_del2(d, &stroke->points[stroke->num_points-1], stroke);
+	    assert(del1 && del2);
+	}
+	assert(dict_contains(todo, stroke));
+	int t;
+	int pos = 0;
+	int incr = 1;
+	if(preserve_direction) {
+	    if(stroke->dir == DIR_UP) {
+		pos = stroke->num_points-1;
+		incr = -1;
+	    }
+	} else {
+	    // try to find matching point on either end.
+	    // Prefer downward.
+	    if(last.x == stroke->points[stroke->num_points-1].x &&
+	       last.y == stroke->points[stroke->num_points-1].y) {
+		pos = stroke->num_points-1;
+		incr = -1;
+	    }
+	}
+	if(last.x != stroke->points[pos].x || last.y != stroke->points[pos].y) {
+	    l[count].x = stroke->points[pos].x * poly->gridsize;
+	    l[count].y = stroke->points[pos].y * poly->gridsize;
+	    l[count].type = gfx_moveTo;
+	    l[count].next = &l[count+1];
+	    count++;
+	    assert(!should_connect);
+	}
+	pos += incr;
+	for(t=1;t<stroke->num_points;t++) {
+	    l[count].x = stroke->points[pos].x * poly->gridsize;
+	    l[count].y = stroke->points[pos].y * poly->gridsize;
+	    l[count].type = gfx_lineTo;
+	    l[count].next = &l[count+1];
+	    count++;
+	    pos += incr;
+	}
+	last = stroke->points[pos-incr];
+	char del = dict_del(todo, stroke);
+	assert(del);
+	assert(!dict_contains(todo, stroke));
+
+	/* try to find a poly which starts at the point we drew last */
+	stroke = dict_lookup(d, &last);
+	should_connect = 1;
+	while(!dict_contains(todo, stroke)) {
+	    should_connect = 0;
+	    stroke = next_todo;
+	    if(!next_todo) {
+		stroke = 0;
+		break;
+	    }
+	    next_todo = next_todo->next;
+	}
+    }
+    l[count-1].next = 0;
+    dict_destroy(todo);
+    dict_destroy(d);
+    return l;
+}
+
+gfxline_t*gfxline_from_gfxpoly(gfxpoly_t*poly)
+{
+    return mkgfxline(poly, 0);
+}
+
+gfxline_t*gfxline_from_gfxpoly_updown(gfxpoly_t*poly)
+{
+    return mkgfxline(poly, 1);
+}
+
+static windcontext_t onepolygon = {1};
+gfxline_t* gfxpoly_circular_to_evenodd(gfxline_t*line, double gridsize)
+{
+    gfxpoly_t*poly = gfxpoly_from_fill(line, gridsize);
+    gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_circular, &onepolygon);
+    gfxline_t*line2 = gfxline_from_gfxpoly(poly2);
+    gfxpoly_destroy(poly);
+    gfxpoly_destroy(poly2);
+    return line2;
+}
+
+gfxpoly_t* gfxpoly_createbox(double x1, double y1,double x2, double y2, double gridsize)
+{
+    gfxline_t* line = gfxline_makerectangle(x1, y1, x2, y2);
+    gfxpoly_t* poly = gfxpoly_from_fill(line, gridsize);
+    gfxline_free(line);
+    return poly;
+}
+