typedef i_img_dim pcord;
typedef struct {
- int n;
+ size_t n;
pcord x,y;
} p_point;
typedef struct {
- int n;
+ size_t n;
pcord x1,y1;
pcord x2,y2;
pcord miny,maxy;
} p_line;
typedef struct {
- int n;
+ size_t n;
double x;
} p_slice;
static
p_line *
-line_set_new(const double *x, const double *y, int l) {
- int i;
- p_line *lset = mymalloc(sizeof(p_line) * l);
-
- for(i=0; i<l; i++) {
- lset[i].n=i;
- lset[i].x1 = IMTRUNC(x[i]);
- lset[i].y1 = IMTRUNC(y[i]);
- lset[i].x2 = IMTRUNC(x[(i+1)%l]);
- lset[i].y2 = IMTRUNC(y[(i+1)%l]);
- lset[i].miny=i_min(lset[i].y1,lset[i].y2);
- lset[i].maxy=i_max(lset[i].y1,lset[i].y2);
- lset[i].minx=i_min(lset[i].x1,lset[i].x2);
- lset[i].maxx=i_max(lset[i].x1,lset[i].x2);
+line_set_new(const i_polygon_t *polys, size_t count, size_t *line_count) {
+ size_t i, j, n;
+ p_line *lset, *line;
+ size_t lines = 0;
+
+ for (i = 0; i < count; ++i)
+ lines += polys[i].count;
+
+ line = lset = mymalloc(sizeof(p_line) * lines);
+
+ n = 0;
+ for (i = 0; i < count; ++i) {
+ const i_polygon_t *p = polys + i;
+
+ for(j = 0; j < p->count; j++) {
+ line->x1 = IMTRUNC(p->x[j]);
+ line->y1 = IMTRUNC(p->y[j]);
+ line->x2 = IMTRUNC(p->x[(j + 1) % p->count]);
+ line->y2 = IMTRUNC(p->y[(j + 1) % p->count]);
+
+ /* don't include purely horizontal lines, we don't usefully
+ intersect with them. */
+ if (line->y1 == line->y2)
+ continue;
+
+ line->miny = i_min(line->y1, line->y2);
+ line->maxy = i_max(line->y1, line->y2);
+ line->minx = i_min(line->x1, line->x2);
+ line->maxx = i_max(line->x1, line->x2);
+ line->n = n++;
+ ++line;
+ }
}
+ *line_count = n;
+
return lset;
}
static
p_point *
-point_set_new(const double *x, const double *y, int l) {
- int i;
- p_point *pset = mymalloc(sizeof(p_point) * l);
+point_set_new(const i_polygon_t *polys, size_t count, size_t *point_count) {
+ size_t i, j, n;
+ p_point *pset, *pt;
+ size_t points = 0;
- for(i=0; i<l; i++) {
- pset[i].n=i;
- pset[i].x=IMTRUNC(x[i]);
- pset[i].y=IMTRUNC(y[i]);
+ for (i = 0; i < count; ++i)
+ points += polys[i].count;
+
+ *point_count = points;
+
+ pt = pset = mymalloc(sizeof(p_point) * points);
+
+ n = 0;
+ for (i = 0; i < count; ++i) {
+ const i_polygon_t *p = polys + i;
+
+ for(j = 0; j < p->count; j++) {
+ pt->n = n++;
+ pt->x = IMTRUNC(p->x[j]);
+ pt->y = IMTRUNC(p->y[j]);
+ ++pt;
+ }
}
return pset;
}
}
}
-
-
static
unsigned char
saturate(int in) {
pcord lminx, lmaxx; /* left line min/max within y bounds in fine coords */
pcord rminx, rmaxx; /* right line min/max within y bounds in fine coords */
i_img_dim cpix; /* x-coordinate of current pixel */
- int thin; /* boolean for thin/thick segment */
i_img_dim startpix; /* temporary variable for "start of this interval" */
i_img_dim stoppix; /* temporary variable for "end of this interval" */
rminx = i_min( p_eval_aty(r, maxy), p_eval_aty(r, miny) );
rmaxx = i_max( p_eval_aty(r, maxy), p_eval_aty(r, miny) );
- thin = coarse(lmaxx) >= coarse(rminx);
-
startpix = i_max( coarse(lminx), 0 );
stoppix = i_min( coarse(rmaxx-1), ss->linelen-1 );
*/
-static void
-i_poly_aa_low(i_img *im, int l, const double *x, const double *y, void *ctx, scanline_flusher flusher) {
+static int
+i_poly_poly_aa_low(i_img *im, int count, const i_polygon_t *polys,
+ void *ctx, scanline_flusher flusher) {
int i ,k; /* Index variables */
i_img_dim clc; /* Lines inside current interval */
/* initialize to avoid compiler warnings */
p_point *pset; /* List of points in polygon */
p_line *lset; /* List of lines in polygon */
p_slice *tllist; /* List of slices */
+ size_t pcount, lcount;
- mm_log((1, "i_poly_aa(im %p, l %d, x %p, y %p, ctx %p, flusher %p)\n", im, l, x, y, ctx, flusher));
+ mm_log((1, "i_poly_poly_aa_low(im %p, count %d, polys %p, ctx %p, flusher %p)\n", im, count, polys, ctx, flusher));
- for(i=0; i<l; i++) {
- mm_log((2, "(%.2f, %.2f)\n", x[i], y[i]));
+ for (k = 0; k < count; ++k) {
+ const i_polygon_t *p = polys + k;
+ mm_log((2, "poly %d\n", k));
+ for(i = 0; i < p->count; i++) {
+ mm_log((2, " (%.2f, %.2f)\n", p->x[i], p->y[i]));
+ }
}
setbuf(stdout, NULL);
);
- tllist = mymalloc(sizeof(p_slice)*l);
-
- ss_scanline_init(&templine, im->xsize, l);
-
- pset = point_set_new(x, y, l);
- lset = line_set_new(x, y, l);
+ pset = point_set_new(polys, count, &pcount);
+ lset = line_set_new(polys, count, &lcount);
+ ss_scanline_init(&templine, im->xsize, lcount);
- qsort(pset, l, sizeof(p_point), (int(*)(const void *,const void *))p_compy);
+ tllist = mymalloc(sizeof(p_slice) * lcount);
+
+ qsort(pset, pcount, sizeof(p_point), (int(*)(const void *,const void *))p_compy);
POLY_DEB(
- for(i=0;i<l;i++) {
+ for(i=0;i<lcount;i++) {
printf("%d [ %d ] (%d , %d) -> (%d , %d) yspan ( %d , %d )\n",
i, lset[i].n, lset[i].x1, lset[i].y1, lset[i].x2, lset[i].y2, lset[i].miny, lset[i].maxy);
}
/* loop on intervals */
- for(i=0; i<l-1; i++) {
+ for(i=0; i<pcount-1; i++) {
i_img_dim startscan = i_max( coarse(pset[i].y), 0);
i_img_dim stopscan = i_min( coarse(pset[i+1].y+15), im->ysize);
pcord miny, maxy; /* y bounds in fine coordinates */
continue;
}
- clc = lines_in_interval(lset, l, tllist, pset[i].y, pset[i+1].y);
+ clc = lines_in_interval(lset, lcount, tllist, pset[i].y, pset[i+1].y);
qsort(tllist, clc, sizeof(p_slice), (int(*)(const void *,const void *))p_compx);
mark_updown_slices(lset, tllist, clc);
myfree(pset);
myfree(lset);
myfree(tllist);
-
-} /* Function */
+
+ return 1;
+}
int
-i_poly_aa(i_img *im, int l, const double *x, const double *y, const i_color *val) {
+i_poly_poly_aa(i_img *im, int count, const i_polygon_t *polys,
+ const i_color *val) {
i_color c = *val;
- i_poly_aa_low(im, l, x, y, &c, scanline_flush);
- return 1;
+ return i_poly_poly_aa_low(im, count, polys, &c, scanline_flush);
+}
+
+int
+i_poly_aa(i_img *im, int l, const double *x, const double *y, const i_color *val) {
+ i_polygon_t poly;
+
+ poly.count = l;
+ poly.x = x;
+ poly.y = y;
+ return i_poly_poly_aa(im, 1, &poly, val);
}
struct poly_render_state {
}
int
-i_poly_aa_cfill(i_img *im, int l, const double *x, const double *y,
- i_fill_t *fill) {
+i_poly_poly_aa_cfill(i_img *im, int count, const i_polygon_t *polys,
+ i_fill_t *fill) {
struct poly_render_state ctx;
+ int result;
i_render_init(&ctx.render, im, im->xsize);
ctx.fill = fill;
ctx.cover = mymalloc(im->xsize);
- i_poly_aa_low(im, l, x, y, &ctx, scanline_flush_render);
+
+ result = i_poly_poly_aa_low(im, count, polys, &ctx, scanline_flush_render);
+
myfree(ctx.cover);
i_render_done(&ctx.render);
- return 1;
+
+ return result;
+}
+
+int
+i_poly_aa_cfill(i_img *im, int l, const double *x, const double *y,
+ i_fill_t *fill) {
+ i_polygon_t poly;
+
+ poly.count = l;
+ poly.x = x;
+ poly.y = y;
+
+ return i_poly_poly_aa_cfill(im, 1, &poly, fill);
}
projects / imager.git / blobdiff