X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fpoly.h;h=3129ee2c036fff455ac856e3c26c4e861bf0b1ab;hp=5d5020903a7cb79f4a205335bf06942c26c887fc;hb=42bba07c1573e32b0cf504e76619fd1bd0eb3dcd;hpb=8d76501168e44398feb36ae4d378178a676d8f2c

diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index 5d50209..3129ee2 100644
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -5,21 +5,23 @@
 #include "../q.h"
 #include "../types.h"
 
-//#define DEBUG
-#define CHECKS
+/* features */
 #define SPLAY
+#define DONT_REMEMBER_CROSSINGS
 
 typedef enum {DIR_UP, DIR_DOWN, DIR_UNKNOWN} segment_dir_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;
+    void*internal;
 } fillstyle_t;
 
 typedef struct _windstate
@@ -45,6 +47,7 @@ typedef struct _windrule
 
 typedef struct _gfxpolystroke {
     segment_dir_t dir;
+    int points_size;
     int num_points;
     point_t*points;
     fillstyle_t*fs;
@@ -52,7 +55,6 @@ typedef struct _gfxpolystroke {
 } gfxpolystroke_t;
 typedef struct _gfxpoly {
     double gridsize;
-    int num_strokes;
     gfxpolystroke_t*strokes;
 } gfxpoly_t;
 
@@ -88,7 +90,9 @@ typedef struct _segment {
     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)
@@ -110,10 +114,14 @@ typedef struct _segment {
 void gfxpoly_fail(char*expr, char*file, int line, const char*function);
 
 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);
 void gfxpoly_save(gfxpoly_t*poly, const char*filename);
-gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context);
+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