X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fpoly.c;h=226584ad199921d1f79abd7d82ad1201ebeb4203;hp=d2c52953b1d471289aaee304db3915170a5581e9;hb=34ea6c36c2a3377546d0e8038f0d4f43b5e3cb6f;hpb=fec1ab31707e68c2396b186e0e4928632402d649 diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c index d2c5295..226584a 100644 --- a/lib/gfxpoly/poly.c +++ b/lib/gfxpoly/poly.c @@ -10,6 +10,7 @@ #include "xrow.h" #include "wind.h" #include "convert.h" +#include "heap.h" static gfxpoly_t*current_polygon = 0; void gfxpoly_fail(char*expr, char*file, int line, const char*function) @@ -75,22 +76,6 @@ static type_t point_type = { free: point_free, }; -typedef struct _status { - int32_t y; - actlist_t*actlist; - heap_t*queue; - xrow_t*xrow; - windrule_t*windrule; - windcontext_t*context; - segment_t*ending_segments; - polywriter_t writer; -#ifdef CHECKS - dict_t*seen_crossings; //list of crossing we saw so far - dict_t*intersecting_segs; //list of segments intersecting in this scanline - dict_t*segs_with_point; //lists of segments that received a point in this scanline -#endif -} status_t; - typedef struct _event { eventtype_t type; point_t p; @@ -101,7 +86,7 @@ typedef struct _event { /* compare_events_simple differs from compare_events in that it schedules events from left to right regardless of type. It's only used in horizontal processing, in order to get an x-wise sorting of the current scanline */ -static int compare_events_simple(const void*_a,const void*_b) +static inline int compare_events_simple(const void*_a,const void*_b) { event_t* a = (event_t*)_a; event_t* b = (event_t*)_b; @@ -112,7 +97,7 @@ static int compare_events_simple(const void*_a,const void*_b) return 0; } -static int compare_events(const void*_a,const void*_b) +static inline int compare_events(const void*_a,const void*_b) { event_t* a = (event_t*)_a; event_t* b = (event_t*)_b; @@ -138,6 +123,29 @@ static int compare_events(const void*_a,const void*_b) //return d; } +#define COMPARE_EVENTS(x,y) (compare_events(x,y)>0) +#define COMPARE_EVENTS_SIMPLE(x,y) (compare_events_simple(x,y)>0) +HEAP_DEFINE(queue,event_t,COMPARE_EVENTS); +HEAP_DEFINE(hqueue,event_t,COMPARE_EVENTS_SIMPLE); + +typedef struct _status { + int32_t y; + actlist_t*actlist; + queue_t queue; + xrow_t*xrow; + windrule_t*windrule; + windcontext_t*context; + segment_t*ending_segments; + + gfxpolystroke_t*strokes; +#ifdef CHECKS + dict_t*seen_crossings; //list of crossing we saw so far + dict_t*intersecting_segs; //list of segments intersecting in this scanline + dict_t*segs_with_point; //lists of segments that received a point in this scanline +#endif +} status_t; + + int gfxpoly_size(gfxpoly_t*poly) { int s,t; @@ -187,10 +195,11 @@ void gfxpoly_dump(gfxpoly_t*poly) fprintf(stderr, "polyon %08x (gridsize: %f)\n", poly, poly->gridsize); gfxpolystroke_t*stroke = poly->strokes; for(;stroke;stroke=stroke->next) { + fprintf(stderr, "%08x", stroke); for(s=0;snum_points-1;s++) { point_t a = stroke->points[s]; point_t b = stroke->points[s+1]; - fprintf(stderr, "%s(%f,%f) -> (%f,%f)%s\n", s?" ":"[", a.x*g, a.y*g, b.x*g, b.y*g, + fprintf(stderr, "%s (%f,%f) -> (%f,%f)%s\n", s?" ":"", a.x*g, a.y*g, b.x*g, b.y*g, s==stroke->num_points-2?"]":""); } } @@ -204,25 +213,28 @@ void gfxpoly_save(gfxpoly_t*poly, const char*filename) int s,t; gfxpolystroke_t*stroke = poly->strokes; for(;stroke;stroke=stroke->next) { - for(s=0;snum_points-1;s++) { - point_t a = stroke->points[s]; - point_t b = stroke->points[s+1]; fprintf(fi, "%g setgray\n", stroke->dir==DIR_UP ? 0.7 : 0); - fprintf(fi, "%d %d moveto\n", a.x, a.y); - fprintf(fi, "%d %d lineto\n", b.x, b.y); - fprintf(fi, "stroke\n"); + point_t p = stroke->points[0]; + fprintf(fi, "%d %d moveto\n", p.x, p.y); + for(s=1;snum_points;s++) { + p = stroke->points[s]; + fprintf(fi, "%d %d lineto\n", p.x, p.y); } + fprintf(fi, "stroke\n"); } fprintf(fi, "showpage\n"); fclose(fi); } -inline static event_t event_new() +inline static event_t* event_new() { - event_t e; - memset(&e, 0, sizeof(e)); + event_t*e = rfx_calloc(sizeof(event_t)); return e; } +inline static void event_free(event_t*e) +{ + free(e); +} static void event_dump(event_t*e) { @@ -255,10 +267,10 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_ if(y1!=y2) { assert(y1dir = DIR_UP; if(x1>x2) { @@ -301,8 +313,9 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_ assert(LINE_EQ(p, s) >= 0); #endif - /* TODO: make this int_type */ +#ifndef DONT_REMEMBER_CROSSINGS dict_init2(&s->scheduled_crossings, &ptr_type, 0); +#endif } static segment_t* segment_new(point_t a, point_t b, int polygon_nr, segment_dir_t dir) @@ -314,7 +327,9 @@ static segment_t* segment_new(point_t a, point_t b, int polygon_nr, segment_dir_ static void segment_clear(segment_t*s) { +#ifndef DONT_REMEMBER_CROSSINGS dict_clear(&s->scheduled_crossings); +#endif } static void segment_destroy(segment_t*s) { @@ -322,33 +337,50 @@ static void segment_destroy(segment_t*s) free(s); } -static void advance_stroke(heap_t*queue, gfxpolystroke_t*stroke, int polygon_nr, int pos) +static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos) { + if(!stroke) + return; + segment_t*s = 0; + /* we need to queue multiple segments at once because we need to process start events + before horizontal events */ while(pos < stroke->num_points-1) { assert(stroke->points[pos].y <= stroke->points[pos+1].y); - segment_t*s = segment_new(stroke->points[pos], stroke->points[pos+1], polygon_nr, stroke->dir); - s->stroke = stroke; - s->stroke_pos = ++pos; + s = segment_new(stroke->points[pos], stroke->points[pos+1], polygon_nr, stroke->dir); + pos++; + s->stroke = 0; + s->stroke_pos = 0; #ifdef DEBUG /*if(l->tmp) s->nr = l->tmp;*/ - fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s (%d more to come)\n", + fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s (stroke %08x, %d more to come)\n", s->nr, s->a.x, s->a.y, s->b.x, s->b.y, - s->dir==DIR_UP?"up":"down", stroke->num_points - 1 - pos); + s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos); #endif - event_t e = event_new(); - e.type = s->delta.y ? EVENT_START : EVENT_HORIZONTAL; - e.p = s->a; - e.s1 = s; - e.s2 = 0; - heap_put(queue, &e); - if(e.type != EVENT_HORIZONTAL) { + event_t* e = event_new(); + e->type = s->delta.y ? EVENT_START : EVENT_HORIZONTAL; + e->p = s->a; + e->s1 = s; + e->s2 = 0; + + if(queue) queue_put(queue, e); + else hqueue_put(hqueue, e); + + if(e->type != EVENT_HORIZONTAL) { break; } } + if(s) { +#ifdef DEBUG + fprintf(stderr, "attaching contingency of stroke %08x to segment [%d] %s\n", + stroke, s, s->delta.y?"":"(horizontal)"); +#endif + s->stroke = stroke; + s->stroke_pos = pos; + } } -static void gfxpoly_enqueue(gfxpoly_t*p, heap_t*queue, int polygon_nr) +static void gfxpoly_enqueue(gfxpoly_t*p, queue_t*queue, hqueue_t*hqueue, int polygon_nr) { int t; gfxpolystroke_t*stroke = p->strokes; @@ -361,7 +393,7 @@ static void gfxpoly_enqueue(gfxpoly_t*p, heap_t*queue, int polygon_nr) assert(stroke->points[s].y <= stroke->points[s+1].y); } #endif - advance_stroke(queue, stroke, polygon_nr, 0); + advance_stroke(queue, hqueue, stroke, polygon_nr, 0); } } @@ -369,12 +401,12 @@ static void schedule_endpoint(status_t*status, segment_t*s) { // schedule end point of segment assert(s->b.y > status->y); - event_t e; - e.type = EVENT_END; - e.p = s->b; - e.s1 = s; - e.s2 = 0; - heap_put(status->queue, &e); + event_t*e = event_new(); + e->type = EVENT_END; + e->p = s->b; + e->s1 = s; + e->s2 = 0; + queue_put(&status->queue, e); } static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) @@ -413,8 +445,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) return; } -#define REMEMBER_CROSSINGS -#ifdef REMEMBER_CROSSINGS +#ifndef DONT_REMEMBER_CROSSINGS if(dict_contains(&s1->scheduled_crossings, (void*)(ptroff_t)s2->nr)) { /* FIXME: this whole segment hashing thing is really slow */ #ifdef DEBUG @@ -443,23 +474,8 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) return; } } + double asign2 = LINE_EQ(s1->a, s2); - double bsign2 = LINE_EQ(s1->b, s2); - if(asign2<0 && bsign2<0) { - // segment1 is completely to the left of segment2 -#ifdef DEBUG - fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s1->nr, s2->nr); -#endif - return; - } - if(asign2>0 && bsign2>0) { - // TODO: can this ever happen? -#ifdef DEBUG - fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s2->nr, s1->nr); -#endif - // segment2 is completely to the left of segment1 - return; - } if(asign2==0) { // segment1 touches segment2 in a single point (ignored) #ifdef DEBUG @@ -467,6 +483,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) #endif return; } + double bsign2 = LINE_EQ(s1->b, s2); if(bsign2==0) { // segment1 touches segment2 in a single point (ignored) #ifdef DEBUG @@ -474,22 +491,26 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) #endif return; } - double asign1 = LINE_EQ(s2->a, s1); - double bsign1 = LINE_EQ(s2->b, s1); - if(asign1<0 && bsign1<0) { + + if(asign2<0 && bsign2<0) { // segment1 is completely to the left of segment2 #ifdef DEBUG fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s1->nr, s2->nr); #endif return; } - if(asign1>0 && bsign1>0) { - // segment2 is completely to the left of segment1 + if(asign2>0 && bsign2>0) { + // segment1 is completely to the right of segment2 +#ifndef DONT_REMEMBER_CROSSINGS + assert(0); +#endif #ifdef DEBUG fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s2->nr, s1->nr); #endif return; } + + double asign1 = LINE_EQ(s2->a, s1); if(asign1==0) { // segment2 touches segment1 in a single point (ignored) #ifdef DEBUG @@ -497,6 +518,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) #endif return; } + double bsign1 = LINE_EQ(s2->b, s1); if(asign2==0) { // segment2 touches segment1 in a single point (ignored) #ifdef DEBUG @@ -505,6 +527,34 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) return; } + if(asign1<0 && bsign1<0) { + // segment2 is completely to the left of segment1 +#ifndef DONT_REMEMBER_CROSSINGS + assert(0); +#endif +#ifdef DEBUG + fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s1->nr, s2->nr); +#endif + return; + } + if(asign1>0 && bsign1>0) { + // segment2 is completely to the right of segment1 +#ifdef DEBUG + fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s2->nr, s1->nr); +#endif + return; + } + +#ifdef DONT_REMEMBER_CROSSINGS + /* s2 crosses s1 from *left* to *right*. This is a crossing we already processed- + there's not way s2 would be to the left of s1 otherwise */ + if(asign1<0 && bsign1>0) return; + if(asign2>0 && bsign2<0) return; +#endif + + assert(!(asign1<0 && bsign1>0)); + assert(!(asign2>0 && bsign2<0)); + /* TODO: should we precompute these? */ double la = (double)s1->a.x*(double)s1->b.y - (double)s1->a.y*(double)s1->b.x; double lb = (double)s2->a.x*(double)s2->b.y - (double)s2->a.y*(double)s2->b.x; @@ -513,10 +563,6 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) p.x = (int32_t)ceil((-la*s2->delta.x + lb*s1->delta.x) / det); p.y = (int32_t)ceil((+lb*s1->delta.y - la*s2->delta.y) / det); -#ifndef REMEMBER_CROSSINGS - if(p.y < status->y) return; -#endif - assert(p.y >= status->y); #ifdef CHECKS assert(p.x >= s1->minx && p.x <= s1->maxx); @@ -525,7 +571,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) point_t pair; pair.x = s1->nr; pair.y = s2->nr; -#ifdef REMEMBER_CROSSINGS +#ifndef DONT_REMEMBER_CROSSINGS assert(!dict_contains(status->seen_crossings, &pair)); dict_put(status->seen_crossings, &pair, 0); #endif @@ -534,19 +580,19 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) fprintf(stderr, "schedule crossing between [%d] and [%d] at (%d,%d)\n", s1->nr, s2->nr, p.x, p.y); #endif -#ifdef REMEMBER_CROSSINGS +#ifndef DONT_REMEMBER_CROSSINGS /* we insert into each other's intersection history because these segments might switch places and we still want to look them up quickly after they did */ dict_put(&s1->scheduled_crossings, (void*)(ptroff_t)(s2->nr), 0); dict_put(&s2->scheduled_crossings, (void*)(ptroff_t)(s1->nr), 0); #endif - event_t e = event_new(); - e.type = EVENT_CROSS; - e.p = p; - e.s1 = s1; - e.s2 = s2; - heap_put(status->queue, &e); + event_t* e = event_new(); + e->type = EVENT_CROSS; + e->p = p; + e->s1 = s1; + e->s2 = s2; + queue_put(&status->queue, e); return; } @@ -602,13 +648,38 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p) fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr, s->pos.x, s->pos.y, p.x, p.y); #endif + /* XXX we probably will never output circular/anticircular polygons, but if + we do, we would need to set the segment direction here */ + fillstyle_t*fs = s->fs_out; + // omit horizontal lines if(s->pos.y != p.y) { point_t a = s->pos; point_t b = p; assert(a.y != b.y); - status->writer.moveto(&status->writer, a.x, a.y); - status->writer.lineto(&status->writer, b.x, b.y); + + gfxpolystroke_t*stroke = status->strokes; + while(stroke) { + point_t p = stroke->points[stroke->num_points-1]; + if(p.x == a.x && p.y == a.y && stroke->fs == fs) + break; + stroke = stroke->next; + } + if(!stroke) { + stroke = rfx_calloc(sizeof(gfxpolystroke_t)); + stroke->dir = DIR_DOWN; + stroke->fs = fs; + stroke->next = status->strokes; + status->strokes = stroke; + stroke->points_size = 2; + stroke->points = rfx_calloc(sizeof(point_t)*stroke->points_size); + stroke->points[0] = a; + stroke->num_points = 1; + } else if(stroke->num_points == stroke->points_size) { + stroke->points_size *= 2; + stroke->points = rfx_realloc(stroke->points, sizeof(point_t)*stroke->points_size); + } + stroke->points[stroke->num_points++] = b; } } else { #ifdef DEBUG @@ -927,7 +998,7 @@ static void event_apply(status_t*status, event_t*e) event_dump(e); #endif intersect_with_horizontal(status, s); - advance_stroke(status->queue, s->stroke, s->polygon_nr, s->stroke_pos); + advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos); segment_destroy(s);e->s1=0; break; } @@ -952,7 +1023,7 @@ static void event_apply(status_t*status, event_t*e) /* schedule segment for xrow handling */ s->left = 0; s->right = status->ending_segments; status->ending_segments = s; - advance_stroke(status->queue, s->stroke, s->polygon_nr, s->stroke_pos); + advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos); break; } case EVENT_START: { @@ -985,7 +1056,7 @@ static void event_apply(status_t*status, event_t*e) #ifdef DEBUG fprintf(stderr, "Ignore this crossing ([%d] not next to [%d])\n", e->s1->nr, e->s2->nr); #endif -#ifdef REMEMBER_CROSSINGS +#ifndef DONT_REMEMBER_CROSSINGS /* ignore this crossing for now (there are some line segments in between). it'll get rescheduled as soon as the "obstacles" are gone */ char del1 = dict_del(&e->s1->scheduled_crossings, (void*)(ptroff_t)e->s2->nr); @@ -996,7 +1067,7 @@ static void event_apply(status_t*status, event_t*e) point_t pair; pair.x = e->s1->nr; pair.y = e->s2->nr; -#ifdef REMEMBER_CROSSINGS +#ifndef DONT_REMEMBER_CROSSINGS assert(dict_contains(status->seen_crossings, &pair)); dict_del(status->seen_crossings, &pair); #endif @@ -1036,18 +1107,19 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c #ifdef DEBUG fprintf(stderr, "========================================================================\n"); #endif - heap_t* queue = heap_new(sizeof(event_t), compare_events_simple); - gfxpoly_enqueue(poly, queue, 0); + hqueue_t hqueue; + hqueue_init(&hqueue); + gfxpoly_enqueue(poly, 0, &hqueue, 0); actlist_t* actlist = actlist_new(); - - event_t*e = heap_chopmax(queue); + + event_t*e = hqueue_get(&hqueue); while(e) { int32_t y = e->p.y; int32_t x = 0; char fill = 0; #ifdef DEBUG - fprintf(stderr, "----------------------------------- %d\n", y); + fprintf(stderr, "HORIZONTALS ----------------------------------- %d\n", y); actlist_dump(actlist, y-1); #endif #ifdef CHECKS @@ -1090,24 +1162,24 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c } segment_t*left = 0; segment_t*s = e->s1; - + switch(e->type) { case EVENT_START: { assert(e->p.x == s->a.x && e->p.y == s->a.y); actlist_insert(actlist, s->a, s->b, s); - event_t e; - e.type = EVENT_END; - e.p = s->b; - e.s1 = s; - e.s2 = 0; - heap_put(queue, &e); + event_t* e = event_new(); + e->type = EVENT_END; + e->p = s->b; + e->s1 = s; + e->s2 = 0; + hqueue_put(&hqueue, e); left = actlist_left(actlist, s); break; } case EVENT_END: { left = actlist_left(actlist, s); actlist_delete(actlist, s); - advance_stroke(queue, s->stroke, s->polygon_nr, s->stroke_pos); + advance_stroke(0, &hqueue, s->stroke, s->polygon_nr, s->stroke_pos); break; } default: assert(0); @@ -1126,45 +1198,43 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c if(e->type == EVENT_END) segment_destroy(s); - free(e); - e = heap_chopmax(queue); + event_free(e); + e = hqueue_get(&hqueue); } while(e && y == e->p.y); assert(!fill); // check that polygon is not bleeding } actlist_destroy(actlist); - heap_destroy(queue); + hqueue_destroy(&hqueue); } gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context) { current_polygon = poly; - heap_t* queue = heap_new(sizeof(event_t), compare_events); - - gfxpoly_enqueue(poly, queue, /*polygon nr*/0); status_t status; memset(&status, 0, sizeof(status_t)); - status.queue = queue; + queue_init(&status.queue); + gfxpoly_enqueue(poly, &status.queue, 0, /*polygon nr*/0); + status.windrule = windrule; status.context = context; status.actlist = actlist_new(); - gfxpolywriter_init(&status.writer); - status.writer.setgridsize(&status.writer, poly->gridsize); #ifdef CHECKS status.seen_crossings = dict_new2(&point_type); - int lasty=heap_peek(queue)?((event_t*)heap_peek(queue))->p.y-1:0; + int32_t lasty=-0x80000000; #endif status.xrow = xrow_new(); - event_t*e = heap_chopmax(queue); + event_t*e = queue_get(&status.queue); while(e) { status.y = e->p.y; - assert(status.y>=lasty); #ifdef CHECKS + assert(status.y>=lasty); + lasty = status.y; status.intersecting_segs = dict_new2(&ptr_type); status.segs_with_point = dict_new2(&ptr_type); #endif @@ -1180,8 +1250,8 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*co do { xrow_add(status.xrow, e->p.x); event_apply(&status, e); - free(e); - e = heap_chopmax(queue); + event_free(e); + e = queue_get(&status.queue); } while(e && status.y == e->p.y); xrow_sort(status.xrow); @@ -1205,11 +1275,14 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*co dict_destroy(status.seen_crossings); #endif actlist_destroy(status.actlist); - heap_destroy(queue); + queue_destroy(&status.queue); xrow_destroy(status.xrow); - gfxpoly_t*p = (gfxpoly_t*)status.writer.finish(&status.writer); + gfxpoly_t*p = (gfxpoly_t*)malloc(sizeof(gfxpoly_t)); + p->gridsize = poly->gridsize; + p->strokes = status.strokes; + gfxpoly_dump(p); add_horizontals(p, &windrule_evenodd, context); // output is always even/odd return p; }