X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxpoly%2Fpoly.c;h=6d821594676b794d00bb0b0f025e093209364826;hp=1c9e7397297610671bd3056f26465eab6b95f5fa;hb=ae2bbf404cbdf63152d22f1b0824468d04f8f8ce;hpb=8d76501168e44398feb36ae4d378178a676d8f2c diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c index 1c9e739..6d82159 100644 --- a/lib/gfxpoly/poly.c +++ b/lib/gfxpoly/poly.c @@ -22,8 +22,8 @@ void gfxpoly_fail(char*expr, char*file, int line, const char*function) void*md5 = init_md5(); int s,t; - for(s=0;snum_strokes;s++) { - gfxpolystroke_t*stroke = ¤t_polygon->strokes[s]; + gfxpolystroke_t*stroke = current_polygon->strokes; + for(;stroke;stroke=stroke->next) { for(t=0;tnum_points;t++) { update_md5(md5, (unsigned char*)&stroke->points[t].x, sizeof(stroke->points[t].x)); update_md5(md5, (unsigned char*)&stroke->points[t].y, sizeof(stroke->points[t].y)); @@ -142,8 +142,8 @@ int gfxpoly_size(gfxpoly_t*poly) { int s,t; int edges = 0; - for(t=0;tnum_strokes;t++) { - gfxpolystroke_t*stroke = &poly->strokes[t]; + gfxpolystroke_t*stroke = poly->strokes; + for(;stroke;stroke=stroke->next) { edges += stroke->num_points-1; } return edges; @@ -153,8 +153,8 @@ char gfxpoly_check(gfxpoly_t*poly) { dict_t*d = dict_new2(&point_type); int s,t; - for(t=0;tnum_strokes;t++) { - gfxpolystroke_t*stroke = &poly->strokes[t]; + gfxpolystroke_t*stroke = poly->strokes; + for(;stroke;stroke=stroke->next) { for(s=0;snum_points;s++) { point_t p = stroke->points[s]; int num = (s>=1 && snum_points-1)?2:1; // mid points are two points (start+end) @@ -185,12 +185,13 @@ void gfxpoly_dump(gfxpoly_t*poly) int s,t; double g = poly->gridsize; fprintf(stderr, "polyon %08x (gridsize: %f)\n", poly, poly->gridsize); - for(t=0;tnum_strokes;t++) { - gfxpolystroke_t*stroke = &poly->strokes[t]; + 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?"]":""); } } @@ -202,16 +203,16 @@ void gfxpoly_save(gfxpoly_t*poly, const char*filename) fprintf(fi, "%% gridsize %f\n", poly->gridsize); fprintf(fi, "%% begin\n"); int s,t; - for(t=0;tnum_strokes;t++) { - gfxpolystroke_t*stroke = &poly->strokes[t]; - for(s=0;snum_points-1;s++) { - point_t a = stroke->points[s]; - point_t b = stroke->points[s+1]; + gfxpolystroke_t*stroke = poly->strokes; + for(;stroke;stroke=stroke->next) { 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); @@ -255,10 +256,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) { @@ -324,17 +325,23 @@ static void segment_destroy(segment_t*s) static void advance_stroke(heap_t*queue, 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; @@ -346,13 +353,21 @@ static void advance_stroke(heap_t*queue, gfxpolystroke_t*stroke, int polygon_nr, 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) { int t; - for(t=0;tnum_strokes;t++) { - gfxpolystroke_t*stroke = &p->strokes[t]; + gfxpolystroke_t*stroke = p->strokes; + for(;stroke;stroke=stroke->next) { assert(stroke->num_points > 1); #ifdef CHECKS @@ -413,8 +428,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 +457,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 +466,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 +474,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 +501,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 +510,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 +546,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 +554,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,7 +563,7 @@ 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); @@ -985,7 +1014,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 +1025,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 @@ -1042,9 +1071,6 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c actlist_t* actlist = actlist_new(); event_t*e = heap_chopmax(queue); - int newstrokes_size = 4; - int num_newstrokes = 0; - gfxpolystroke_t*newstrokes = malloc(sizeof(gfxpolystroke_t)*newstrokes_size); while(e) { int32_t y = e->p.y; int32_t x = 0; @@ -1063,11 +1089,10 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c #endif assert(xp.x); - if(num_newstrokes == newstrokes_size) { - newstrokes_size = (newstrokes_size)<<1; - newstrokes = rfx_realloc(newstrokes, sizeof(gfxpolystroke_t)*newstrokes_size); - } - gfxpolystroke_t*stroke = &newstrokes[num_newstrokes++]; + gfxpolystroke_t*stroke = rfx_calloc(sizeof(gfxpolystroke_t)); + stroke->next = poly->strokes; + poly->strokes = stroke; + stroke->num_points = 2; stroke->points = malloc(sizeof(point_t)*2); stroke->dir = DIR_UP; // FIXME @@ -1137,11 +1162,6 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c assert(!fill); // check that polygon is not bleeding } - poly->strokes = rfx_realloc(poly->strokes, sizeof(gfxpolystroke_t)*(num_newstrokes+poly->num_strokes)); - memcpy(&poly->strokes[poly->num_strokes], newstrokes, sizeof(gfxpolystroke_t)*num_newstrokes); - poly->num_strokes += num_newstrokes; - free(newstrokes); - actlist_destroy(actlist); heap_destroy(queue); }