X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fpoly.h;h=180a4f1f7cb21f96d73d465a233c1e2a803928e7;hp=ac1ff376ca0858eab246d11bf96d047b2a99f8d7;hb=37ae23b3b4f65f65313ca4648197bf2251211193;hpb=ae9783cbbddf61f59a1d43180be3999206e5b28f

diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index ac1ff37..180a4f1 100644
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -3,63 +3,58 @@
 
 #include <stdint.h>
 #include "../q.h"
+#include "../types.h"
+#include "wind.h"
 
 //#define DEBUG
 #define CHECKS
+
+/* features */
 #define SPLAY
+#define DONT_REMEMBER_CROSSINGS
 
-typedef enum {DIR_UP, DIR_DOWN} segment_dir_t;
-typedef enum {EVENT_CROSS, EVENT_END, EVENT_CORNER, EVENT_START, EVENT_HORIZONTAL} eventtype_t;
+typedef enum {EVENT_CROSS, EVENT_END, EVENT_START, EVENT_HORIZONTAL} eventtype_t;
 typedef enum {SLOPE_POSITIVE, SLOPE_NEGATIVE} slope_t;
 
+#define INVALID_COORD (0x7fffffff)
 typedef struct _point {
     int32_t x;
     int32_t y;
 } point_t;
+type_t point_type;
 
-typedef struct _fillstyle {
-    char is_filled;
-} fillstyle_t;
+#define SEGNR(s) ((int)((s)?(s)->nr:-1))
 
-typedef struct _edge {
-    point_t a;
-    point_t b;
-    fillstyle_t*style;
-    int tmp;
-    struct _edge *next;
-} edge_t;
-
-typedef struct _windstate
-{
-    char is_filled;
-    int wind_nr;
-    int num_polygons;
-} windstate_t;
-
-typedef struct _windrule
-{
-    windstate_t (*start)(int num_polygons);
-    windstate_t (*add)(windstate_t left, fillstyle_t*edge, segment_dir_t dir, int polygon_nr);
-    fillstyle_t* (*diff)(windstate_t*left, windstate_t*right);
-} windrule_t;
-
-#define SEGNR(s) ((s)?(s)->nr:-1)
+typedef struct _gfxpolystroke {
+    segment_dir_t dir;
+    edgestyle_t*fs;
+    int points_size;
+    int num_points;
+    point_t*points;
+    struct _gfxpolystroke*next;
+} gfxpolystroke_t;
+typedef struct _gfxpoly {
+    double gridsize;
+    gfxpolystroke_t*strokes;
+} gfxpoly_t;
 
 typedef struct _segment {
     point_t a;
     point_t b;
     point_t delta;
     double k; //k = a.x*b.y-a.y*b.x = delta.y*a.x - delta.x*a.y (=0 for points on the segment)
-    int minx, maxx;
+    int32_t minx, maxx;
     
     segment_dir_t dir;
-    fillstyle_t*fs;
-    fillstyle_t*fs_out;
+    edgestyle_t*fs;
+    edgestyle_t*fs_out;
+#ifdef CHECKS
     char fs_out_ok;
+#endif
     
     int polygon_nr;
     windstate_t wind;
-    int nr;
+    ptroff_t nr;
 
 #ifdef SPLAY
     struct _segment*parent;
@@ -72,7 +67,12 @@ typedef struct _segment {
 
     point_t pos;
 
+    gfxpolystroke_t*stroke;
+    int stroke_pos;
+
+#ifndef DONT_REMEMBER_CROSSINGS
     dict_t scheduled_crossings;
+#endif
 } segment_t;
 
 #define LINE_EQ(p,s) ((double)(s)->delta.y*(p).x - (double)(s)->delta.x*(p).y - (s)->k)
@@ -91,26 +91,18 @@ typedef struct _segment {
 #define XDIFF(s1,s2,ypos) (((s1)->k + (double)(s1)->delta.x*ypos)*(s2)->delta.y - \
                            ((s2)->k + (double)(s2)->delta.x*ypos)*(s1)->delta.y)
 
-typedef struct _gfxpoly {
-    double gridsize;
-    edge_t*edges;
-} gfxpoly_t;
-
 void gfxpoly_fail(char*expr, char*file, int line, const char*function);
 
-gfxpoly_t* gfxpoly_new(double gridsize);
 char gfxpoly_check(gfxpoly_t*poly);
+int gfxpoly_num_segments(gfxpoly_t*poly);
 int gfxpoly_size(gfxpoly_t*poly);
 void gfxpoly_dump(gfxpoly_t*poly);
-gfxpoly_t* gfxpoly_save(gfxpoly_t*poly, const char*filename);
-gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule);
-
-typedef struct _event {
-    eventtype_t type;
-    point_t p;
-    segment_t*s1;
-    segment_t*s2;
-} event_t;
+void gfxpoly_save(gfxpoly_t*poly, const char*filename);
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename);
+gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context);
+
+gfxpoly_t* gfxpoly_intersect(gfxpoly_t*p1, gfxpoly_t*p2);
+gfxpoly_t* gfxpoly_union(gfxpoly_t*p1, gfxpoly_t*p2);
 
 #ifndef CHECKS
 #ifdef assert