X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fpoly.c;h=53b45e258c2fbe0587943d7de2d39d184f086bc2;hp=6d821594676b794d00bb0b0f025e093209364826;hb=05861649cece70d65e7ba84c3696039c0143ce9c;hpb=ae2bbf404cbdf63152d22f1b0824468d04f8f8ce diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c index 6d82159..53b45e2 100644 --- a/lib/gfxpoly/poly.c +++ b/lib/gfxpoly/poly.c @@ -3,13 +3,13 @@ #include #include "../mem.h" #include "../types.h" -#include "../q.h" #include "../MD5.h" #include "poly.h" #include "active.h" #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) @@ -19,7 +19,7 @@ void gfxpoly_fail(char*expr, char*file, int line, const char*function) exit(1); } - void*md5 = init_md5(); + void*md5 = initialize_md5(); int s,t; gfxpolystroke_t*stroke = current_polygon->strokes; @@ -68,29 +68,13 @@ static void point_free(void*o) p->y = 0; free(p); } -static type_t point_type = { +type_t point_type = { equals: point_equals, hash: point_hash, dup: point_dup, 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 +85,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 +96,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 +122,38 @@ 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_num_segments(gfxpoly_t*poly) +{ + gfxpolystroke_t*stroke = poly->strokes; + int count = 0; + for(;stroke;stroke=stroke->next) { + count++; + } + return count; +} int gfxpoly_size(gfxpoly_t*poly) { int s,t; @@ -151,6 +167,7 @@ int gfxpoly_size(gfxpoly_t*poly) char gfxpoly_check(gfxpoly_t*poly) { + current_polygon = poly; dict_t*d = dict_new2(&point_type); int s,t; gfxpolystroke_t*stroke = poly->strokes; @@ -218,12 +235,15 @@ void gfxpoly_save(gfxpoly_t*poly, const char*filename) 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) { @@ -240,8 +260,8 @@ static void event_dump(event_t*e) } } -static inline max32(int32_t v1, int32_t v2) {return v1>v2?v1:v2;} -static inline min32(int32_t v1, int32_t v2) {return v1v2?v1:v2;} +static inline int32_t min32(int32_t v1, int32_t v2) {return v1nr = segment_count++; #ifdef CHECKS + /* notice: on some systems (with some compilers), for the line + (1073741823,-1073741824)->(1073741823,1073741823) + we get LINE_EQ(s->a, s) == 1. + That's why we now clamp to 26 bit. + */ assert(LINE_EQ(s->a, s) == 0); assert(LINE_EQ(s->b, s) == 0); @@ -302,8 +327,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) @@ -315,7 +341,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) { @@ -323,7 +351,7 @@ 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; @@ -343,27 +371,26 @@ static void advance_stroke(heap_t*queue, gfxpolystroke_t*stroke, int polygon_nr, s->nr, s->a.x, s->a.y, s->b.x, s->b.y, 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; @@ -376,7 +403,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); } } @@ -384,12 +411,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) @@ -570,12 +597,12 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2) 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; } @@ -631,13 +658,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 @@ -893,7 +945,8 @@ static void recalculate_windings(status_t*status, segrange_t*range) s->fs_out = status->windrule->diff(&wind, &s->wind); #ifdef DEBUG - fprintf(stderr, "[%d] %s/%d/%s/%s %s\n", s->nr, s->dir==DIR_UP?"up":"down", s->wind.wind_nr, s->wind.is_filled?"fill":"nofill", s->fs_out?"draw":"omit", + fprintf(stderr, "[%d] dir=%s wind=%d wind.filled=%s fs_old/new=%s/%s %s\n", s->nr, s->dir==DIR_UP?"up":"down", s->wind.wind_nr, s->wind.is_filled?"fill":"nofill", + fs_old?"draw":"omit", s->fs_out?"draw":"omit", fs_old!=s->fs_out?"CHANGED":""); #endif assert(!(!s->changed && fs_old!=s->fs_out)); @@ -956,7 +1009,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; } @@ -981,7 +1034,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: { @@ -1065,18 +1118,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 @@ -1119,24 +1173,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); @@ -1155,45 +1209,50 @@ 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 +#ifdef CHECKS + char bleeding = fill; + assert(!bleeding); +#endif } actlist_destroy(actlist); - heap_destroy(queue); + hqueue_destroy(&hqueue); } -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) { - current_polygon = poly; - heap_t* queue = heap_new(sizeof(event_t), compare_events); - - gfxpoly_enqueue(poly, queue, /*polygon nr*/0); + current_polygon = poly1; status_t status; memset(&status, 0, sizeof(status_t)); - status.queue = queue; + queue_init(&status.queue); + gfxpoly_enqueue(poly1, &status.queue, 0, /*polygon nr*/0); + if(poly2) { + assert(poly1->gridsize == poly2->gridsize); + gfxpoly_enqueue(poly2, &status.queue, 0, /*polygon nr*/1); + } + 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 @@ -1209,8 +1268,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); @@ -1234,11 +1293,23 @@ 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 = poly1->gridsize; + p->strokes = status.strokes; add_horizontals(p, &windrule_evenodd, context); // output is always even/odd return p; } + +static windcontext_t twopolygons = {2}; +gfxpoly_t* gfxpoly_intersect(gfxpoly_t*p1, gfxpoly_t*p2) +{ + return gfxpoly_process(p1, p2, &windrule_intersect, &twopolygons); +} +gfxpoly_t* gfxpoly_union(gfxpoly_t*p1, gfxpoly_t*p2) +{ + return gfxpoly_process(p1, p2, &windrule_union, &twopolygons); +}