X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fconvert.c;h=50282b93264dfd4d009007dde53d3ea04ea4098f;hp=10171f28c3a11f6a6640a34363aacf6fdb7b0aac;hb=002f2ed7c404339e11d669aa86ec998d8dd473a5;hpb=66a03382aab040571f94b0861719753bda3ff8f1

diff --git a/lib/gfxpoly/convert.c b/lib/gfxpoly/convert.c
index 10171f2..50282b9 100644
--- a/lib/gfxpoly/convert.c
+++ b/lib/gfxpoly/convert.c
@@ -4,31 +4,47 @@
 #include "../gfxdevice.h"
 #include "poly.h"
 
-static inline void gfxpoly_add_segment(segment_t**list, double _x1, double _y1, double _x2, double _y2)
+static edge_t*edge_new(int x1, int y1, int x2, int y2)
+{
+    edge_t*s = malloc(sizeof(edge_t));
+    s->a.x = x1;
+    s->a.y = y1;
+    s->b.x = x2;
+    s->b.y = y2;
+    s->next = 0;
+    return s;
+}
+
+static inline void gfxpoly_add_edge(edge_t**list, double _x1, double _y1, double _x2, double _y2)
 {
     int x1 = ceil(_x1);
     int y1 = ceil(_y1);
     int x2 = ceil(_x2);
     int y2 = ceil(_y2);
-    if(y1!=y2) {
-        segment_t*s = segment_new(x1, y1, x2, y2);
-        segment_insert_before(list, s);
+    if(x1!=x2 || y1!=y2) {
+        edge_t*s = edge_new(x1, y1, x2, y2);
+        s->next = *list;
+        *list = s;
     }
 }
 
-gfxpoly_t* gfxpoly_fillToPoly(gfxline_t*line)
+gfxpoly_t* gfxpoly_fillToPoly(gfxline_t*line, double gridsize)
 {
-    segment_t*s = 0;
+    edge_t*s = 0;
 
     /* factor that determines into how many line fragments a spline is converted */
     double subfraction = 2.4;//0.3
 
+    double z = 1.0 / gridsize;
+
     double lastx=0, lasty=0;
     assert(!line || line[0].type == gfx_moveTo);
     while(line) {
+        double x = line->x*z;
+        double y = line->y*z;
         if(line->type == gfx_moveTo) {
         } else if(line->type == gfx_lineTo) {
-            gfxpoly_add_segment(&s, lastx, lasty, line->x, line->y);
+            gfxpoly_add_edge(&s, lastx, lasty, x, y);
 	} else if(line->type == gfx_splineTo) {
             int parts = (int)(sqrt(fabs(line->x-2*line->sx+lastx) + 
                                    fabs(line->y-2*line->sy+lasty))*subfraction);
@@ -37,20 +53,23 @@ gfxpoly_t* gfxpoly_fillToPoly(gfxline_t*line)
             int i;
 	    for(i=0;i<parts;i++) {
 		double t = (double)i*stepsize;
-		double x = line->x*t*t + 2*line->sx*t*(1-t) + x*(1-t)*(1-t);
-		double y = line->y*t*t + 2*line->sy*t*(1-t) + y*(1-t)*(1-t);
-                gfxpoly_add_segment(&s, lastx, lasty, x, y);
-                lastx = x;
-                lasty = y;
+		double sx = (line->x*t*t + 2*line->sx*t*(1-t) + x*(1-t)*(1-t))*z;
+		double sy = (line->y*t*t + 2*line->sy*t*(1-t) + y*(1-t)*(1-t))*z;
+                gfxpoly_add_edge(&s, lastx, lasty, sx, sy);
+                lastx = sx;
+                lasty = sy;
 	    }
-            gfxpoly_add_segment(&s, lastx, lasty, line->x, line->y);
+            gfxpoly_add_edge(&s, lastx, lasty, x, y);
         }
-        lastx = line->x;
-        lasty = line->y;
+        lastx = x;
+        lasty = y;
         line = line->next;
     }
 
     gfxline_free(line);
-    return s;
+
+    gfxpoly_t*p = gfxpoly_new(gridsize);
+    p->edges = s;
+    return p;
 }