X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxpoly%2Factive.h;h=02073b01d92a88fa0b6997288dda34e27ca175e7;hb=83aa304f14f03d1a214817fa3af43dda74436415;hp=791e6599ad7b8c55a7c8d79b926343b91c58fda0;hpb=163bdd5cab1758e4517e8365b3e40b5461d63640;p=swftools.git

diff --git a/lib/gfxpoly/active.h b/lib/gfxpoly/active.h
index 791e659..02073b0 100644
--- a/lib/gfxpoly/active.h
+++ b/lib/gfxpoly/active.h
@@ -2,25 +2,29 @@
 #define __active_h__
 
 #include "poly.h"
-//#include "splay.h"
 
 typedef struct _actlist
 {
-    //SPLAY_HEAD(root, actnode_t);
     segment_t*list;
     int size;
+#ifdef SPLAY
+    segment_t*root;
+#endif
 } actlist_t;
 
+#define actlist_left(a,s) ((s)->left)
+#define actlist_right(a,s) ((s)?(s)->right:(a)->list)
+
 actlist_t* actlist_new();
 void actlist_destroy(actlist_t*a);
 int actlist_size(actlist_t*a);
-void actlist_verify_and_dump(actlist_t*a, int32_t y);
+void actlist_verify(actlist_t*a, int32_t y);
+void actlist_dump(actlist_t*a, int32_t y);
 segment_t* actlist_find(actlist_t*a, point_t p1, point_t p2);  // finds segment immediately to the left of p1 (breaking ties w/ p2)
-void actlist_insert(actlist_t*a, point_t p, segment_t*s);
+void actlist_insert(actlist_t*a, point_t p1, point_t p2, segment_t*s);
 void actlist_delete(actlist_t*a, segment_t*s);
 void actlist_swap(actlist_t*a, segment_t*s1, segment_t*s2);
-segment_t* actlist_left(actlist_t*a, segment_t*s);
 segment_t* actlist_leftmost(actlist_t*a);
-segment_t* actlist_right(actlist_t*a, segment_t*s);
+segment_t* actlist_rightmost(actlist_t*a);
 
 #endif