polygon intersector improvements

[swftools.git] / lib / gfxpoly / poly.h

diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index 972d471..6314935 100644 (file)
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -5,7 +5,7 @@
 #include "../q.h"
 
 typedef enum {DIR_UP, DIR_DOWN} segment_dir_t;
-typedef enum {EVENT_CROSS, EVENT_END, EVENT_START} eventtype_t;
+typedef enum {EVENT_CROSS, EVENT_END, EVENT_HORIZONTAL, EVENT_START} eventtype_t;
 typedef enum {SLOPE_POSITIVE, SLOPE_NEGATIVE} slope_t;
 
 typedef struct _point {
@@ -13,9 +13,14 @@ typedef struct _point {
     int32_t y;
 } point_t;
 
+typedef struct _fillstyle {
+    char is_filled;
+} fillstyle_t;
+
 typedef struct _edge {
     point_t a;
     point_t b;
+    fillstyle_t*style;
     struct _edge *next;
 } edge_t;
 
@@ -24,17 +29,23 @@ typedef struct _segment {
     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)
+    
     segment_dir_t dir;
+    fillstyle_t*style;
+
     int nr;
     struct _segment*left;
     struct _segment*right;
-    int tmp;
+    
     point_t pos;
+    point_t new_point;
+    point_t new_pos;
 
     dict_t scheduled_crossings;
 } segment_t;
 
 #define LINE_EQ(p,s) ((double)(s)->delta.y*(p).x - (double)(s)->delta.x*(p).y - (s)->k)
+#define XPOS(s,ypos) ((s)->a.x + ceil(((s)->delta.x * (double)((ypos) - (s)->a.y)) / (s)->delta.y))
 
 typedef edge_t gfxpoly_t;
 gfxpoly_t* gfxpoly_new();