#endif
} status_t;
-int compare_events_simple(const void*_a,const void*_b)
+/* 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)
{
event_t* a = (event_t*)_a;
event_t* b = (event_t*)_b;
return 0;
}
-int compare_events(const void*_a,const void*_b)
+static int compare_events(const void*_a,const void*_b)
{
event_t* a = (event_t*)_a;
event_t* b = (event_t*)_b;
gfxpoly_t* gfxpoly_save(gfxpoly_t*poly, const char*filename)
{
FILE*fi = fopen(filename, "wb");
+ fprintf(fi, "%% gridsize %f\n", poly->gridsize);
fprintf(fi, "%% begin\n");
edge_t* s = poly->edges;
while(s) {
void segment_dump(segment_t*s)
{
fprintf(stderr, "(%d,%d)->(%d,%d) ", s->a.x, s->a.y, s->b.x, s->b.y);
- fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f\n", s->delta.x, s->delta.y, s->k,
+ fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f\n", s->delta.x, s->delta.y, s->k,
(double)s->delta.x / s->delta.y);
}
continue;
}
segment_t*s = segment_new(l->a.x, l->a.y, l->b.x, l->b.y, initial, polygon_nr);
+#ifdef DEBUG
if(l->tmp)
s->nr = l->tmp;
-#ifdef DEBUG
fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s\n",
s->nr, s->a.x, s->a.y, s->b.x, s->b.y,
s->dir==DIR_UP?"up":"down");
if(s->fs_out) {
#ifdef DEBUG
- fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr,
+ 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
// omit horizontal lines
if(s->pos.y != p.y) {
edge_t*e = rfx_calloc(sizeof(edge_t));
+#ifdef DEBUG
e->tmp = s->nr;
+#endif
e->a = s->pos;
e->b = p;
assert(e->a.y != e->b.y);
s->pos = p;
}
-/* by restricting the recalculation of line segments to a range between the lowest
- and the highest modified segment, we only do about a 33% overprocessing of fill
- styles. (update: that statistic might be outdated now that xmin/xmax are double) */
typedef struct _segrange {
double xmin;
segment_t*segmin;
segment_t*segmax;
} segrange_t;
-static inline char xpos_eq(segment_t*s1, segment_t*s2, int y)
-{
- if(XPOS_EQ(s1, s2, y)) {
- return 1;
- }
- return 0;
-}
-
void segrange_adjust_endpoints(segrange_t*range, int y)
{
+#define XPOS_EQ(s1,s2,ypos) (XPOS((s1),(ypos))==XPOS((s2),(ypos)))
#ifdef CHECK
/* this would mean that the segment left/right of the minimum/maximum
intersects the current segment exactly at the scanline, but somehow
assert(!max || !max->right || !XPOS_EQ(max, max->right, y));
#endif
+ /* this doesn't actually ever happen anymore (see checks above) */
segment_t*min = range->segmin;
segment_t*max = range->segmax;
- if(min) while(min->left && xpos_eq(min, min->left, y)) {
+ if(min) while(min->left && XPOS_EQ(min, min->left, y)) {
min = min->left;
}
- if(max) while(max->right && xpos_eq(max, max->right, y)) {
+ if(max) while(max->right && XPOS_EQ(max, max->right, y)) {
max = max->right;
}
range->segmin = min;
for(t=0;t<status->xrow->num;t++) {
box_t box = box_new(status->xrow->x[t], y);
segment_t*seg = actlist_find(status->actlist, box.left2, box.left2);
-
- seg = actlist_right(status->actlist, seg);
+ seg = actlist_right(status->actlist, seg);
while(seg) {
if(seg->a.y == y) {
// this segment started in this scanline, ignore it
for(t=status->xrow->num-1;t>=0;t--) {
box_t box = box_new(status->xrow->x[t], y);
segment_t*seg = actlist_find(status->actlist, box.right2, box.right2);
-
+
while(seg) {
if(seg->a.y == y) {
// this segment started in this scanline, ignore it
segment_t*next = seg->right;seg->right=0;
assert(seg->b.y == status->y);
-
+
if(status->xrow->num == 1) {
// shortcut
point_t p = {status->xrow->x[0], y};
s = actlist_leftmost(status->actlist);
while(s && s!=range->segmin) {
assert(!s->changed);
- s = actlist_right(status->actlist, s);
+ s = s->right;
}
s = actlist_rightmost(status->actlist);
while(s && s!=range->segmax) {
assert(!s->changed);
- s = actlist_left(status->actlist, s);
+ s = s->left;
}
/* in check mode, go through the whole interval so we can test
that all polygons where the fillstyle changed also have seg->changed=1 */
end = actlist_right(status->actlist, end);
while(s!=end) {
#ifndef CHECK
- if(s->changed)
+ if(s->changed)
#endif
{
segment_t* left = actlist_left(status->actlist, s);
fprintf(stderr, "[%d] %s/%d/%s/%s ", s->nr, s->dir==DIR_UP?"up":"down", s->wind.wind_nr, s->wind.is_filled?"fill":"nofill", s->fs_out?"draw":"omit");
#endif
}
- s = actlist_right(status->actlist, s);
+ s = s->right;
}
#ifdef DEBUG
fprintf(stderr, "\n");
xrow_add(status->xrow, h->a.x);
point_t o = h->a;
- left = actlist_right(status->actlist, left);
- right = actlist_right(status->actlist, right);
+ if(!right) {
+ assert(!left);
+ return;
+ }
+
+ left = actlist_right(status->actlist, left); //first seg to the right of h->a
+ right = right->right; //first seg to the right of h->b
segment_t* s = left;
while(s!=right) {
assert(s->delta.x > 0 && x <= s->b.x || s->delta.x <= 0 && x >= s->b.x);
xrow_add(status->xrow, x);
- s = actlist_right(status->actlist, s);
+ s = s->right;
}
}
event_dump(e);
#endif
segment_t*s = e->s1;
- actlist_insert(status->actlist, e->p, s);
+ assert(e->p.x == s->a.x && e->p.y == s->a.y);
+ actlist_insert(status->actlist, s->a, s->b, s);
segment_t*left = actlist_left(status->actlist, s);
segment_t*right = actlist_right(status->actlist, s);
if(left)
actlist_dump(actlist, y-1);
#endif
#ifdef CHECKS
- /* FIXME: this actually fails sometimes */
actlist_verify(actlist, y-1);
#endif
do {
windstate_t before,after;
switch(e->type) {
case EVENT_START: {
- actlist_insert(actlist, e->p, s);
+ 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;
git.asbjorn.biz / swftools.git / blobdiff