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

diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index 186075a..3129ee2 100644
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -5,9 +5,6 @@
 #include "../q.h"
 #include "../types.h"
 
-//#define DEBUG
-//#define CHECKS
-
 /* features */
 #define SPLAY
 #define DONT_REMEMBER_CROSSINGS
@@ -16,13 +13,15 @@ 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
@@ -115,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