From 6218ea71a2a175dca5bf88ca7922e97f42f85e69 Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Mon, 3 Oct 2016 10:24:08 +0300 Subject: [PATCH] split the polyfiller to a preprocessor-based template file, included multiple times in polyfill.c to instanciate all the variants. currently fully implemented are: flat and gouraud. --- src/3dgfx.h | 3 +- src/polyfill.c | 121 +++++++++----------------------- src/polyfill.h | 5 +- src/polytest.c | 2 + src/polytmpl.h | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 252 insertions(+), 89 deletions(-) create mode 100644 src/polytmpl.h diff --git a/src/3dgfx.h b/src/3dgfx.h index ee9de63..ecc3f3c 100644 --- a/src/3dgfx.h +++ b/src/3dgfx.h @@ -37,7 +37,8 @@ enum { G3D_CCW, G3D_CW }; /* arg to g3d_polygon_mode */ enum { G3D_WIRE, - G3D_FLAT + G3D_FLAT, + G3D_GOURAUD, }; /* matrix stacks */ diff --git a/src/polyfill.c b/src/polyfill.c index 80bfee5..634d525 100644 --- a/src/polyfill.c +++ b/src/polyfill.c @@ -14,7 +14,9 @@ void (*fillfunc[])(struct pvertex*, int) = { polyfill_wire, polyfill_flat, - 0, 0, 0 + polyfill_gouraud, + polyfill_tex, + polyfill_tex_gouraud }; struct pimage pimg_fb, pimg_texture; @@ -55,92 +57,37 @@ void polyfill_wire(struct pvertex *verts, int nverts) } } -static uint32_t scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *edge); - #define NEXTIDX(x) (((x) - 1 + nverts) % nverts) #define PREVIDX(x) (((x) + 1) % nverts) -void polyfill_flat(struct pvertex *pv, int nverts) -{ - int i; - int topidx = 0, botidx = 0, sltop = pimg_fb.height, slbot = 0; - struct pvertex *left, *right; - uint16_t color = PACK_RGB16(pv[0].r, pv[0].g, pv[0].b); - - for(i=1; i pv[botidx].y) botidx = i; - } - - left = (struct pvertex*)alloca(pimg_fb.height * sizeof *left); - right = (struct pvertex*)alloca(pimg_fb.height * sizeof *right); - memset(left, 0, pimg_fb.height * sizeof *left); - memset(right, 0, pimg_fb.height * sizeof *right); - - for(i=0; i> 8) == (y1 >> 8)) { - if(y0 > y1) { - int idx = y0 >> 8; - left[idx].x = pv[i].x < pv[next].x ? pv[i].x : pv[next].x; - right[idx].x = pv[i].x < pv[next].x ? pv[next].x : pv[i].x; - } - } else { - struct pvertex *edge = y0 > y1 ? left : right; - uint32_t res = scan_edge(pv + i, pv + next, edge); - uint32_t tmp = (res >> 16) & 0xffff; - if(tmp > slbot) slbot = tmp; - if((tmp = res & 0xffff) < sltop) { - sltop = tmp; - } - } - } - - for(i=sltop; i<=slbot; i++) { - int32_t x; - uint16_t *pixptr; - - x = left[i].x; - pixptr = pimg_fb.pixels + i * pimg_fb.width + (x >> 8); - - while(x <= right[i].x) { -#ifdef DEBUG_POLYFILL - *pixptr++ += 15; -#else - *pixptr++ = color; -#endif - x += 256; - } - } -} - -static uint32_t scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *edge) -{ - int i; - int32_t x, dx, dy, slope; - int32_t start_idx, end_idx; - - if(v0->y > v1->y) { - struct pvertex *tmp = v0; - v0 = v1; - v1 = tmp; - } - - dy = v1->y - v0->y; - dx = v1->x - v0->x; - slope = (dx << 8) / dy; - - start_idx = v0->y >> 8; - end_idx = v1->y >> 8; - - x = v0->x; - for(i=start_idx; iy > v1->y) { + struct pvertex *tmp = v0; + v0 = v1; + v1 = tmp; + } + + x = v0->x; + dy = v1->y - v0->y; + dx = v1->x - v0->x; + slope = (dx << 8) / dy; +#ifdef GOURAUD + r = (v0->r << 8); + g = (v0->g << 8); + b = (v0->b << 8); + dr = (v1->r << 8) - r; + dg = (v1->g << 8) - g; + db = (v1->b << 8) - b; + rslope = (dr << 8) / dy; + gslope = (dg << 8) / dy; + bslope = (db << 8) / dy; +#endif +#ifdef TEXMAP + u = v0->u; + v = v0->v; + du = v1->u - v0->u; + dv = v1->v - v0->v; + uslope = (du << 8) / dy; + vslope = (dv << 8) / dy; +#endif + + start_idx = v0->y >> 8; + end_idx = v1->y >> 8; + + for(i=start_idx; i pv[botidx].y) botidx = i; + } + + left = alloca(pimg_fb.height * sizeof *left); + right = alloca(pimg_fb.height * sizeof *right); + + for(i=0; i> 8) == (y1 >> 8)) { + if(y0 > y1) { + int idx = y0 >> 8; + left[idx].x = pv[i].x < pv[next].x ? pv[i].x : pv[next].x; + right[idx].x = pv[i].x < pv[next].x ? pv[next].x : pv[i].x; + } + } else { + struct pvertex *edge = y0 > y1 ? left : right; + uint32_t res = SCANEDGE(pv + i, pv + next, edge); + uint32_t tmp = (res >> 16) & 0xffff; + if(tmp > slbot) slbot = tmp; + if((tmp = res & 0xffff) < sltop) { + sltop = tmp; + } + } + } + + /* find the mid-point and calculate slopes for all attributes */ +#if 0 +#if defined(GOURAUD) || defined(TEXMAP) + mid = (sltop + slbot) >> 1; + dx = right[mid].x - left[mid].x; + if((tmp = right[sltop].x - left[sltop].x) > dx) { + dx = tmp; + mid = sltop; + } + if((tmp = right[slbot].x - left[slbot].x) > dx) { + dx = tmp; + mid = slbot; + } + if(!dx) { + dx = 256; /* 1 */ + } +#endif +#ifdef GOURAUD + dr = right[mid].r - left[mid].r; + dg = right[mid].g - left[mid].g; + db = right[mid].b - left[mid].b; + rslope = (dr << 8) / dx; + gslope = (dg << 8) / dx; + bslope = (db << 8) / dx; +#endif +#ifdef TEXMAP + du = right[mid].u - left[mid].u; + dv = right[mid].v - left[mid].v; + uslope = (du << 8) / dx; + vslope = (dv << 8) / dx; +#endif +#endif /* 0 */ + + for(i=sltop; i<=slbot; i++) { + uint16_t *pixptr; + int32_t x; + + x = left[i].x; + pixptr = pimg_fb.pixels + i * pimg_fb.width + (x >> 8); + +#if defined(GOURAUD) || defined(TEXMAP) + if(!(dx = right[i].x - left[i].x)) dx = 256; /* 1 */ +#endif +#ifdef GOURAUD + r = left[i].r; + g = left[i].g; + b = left[i].b; + dr = right[i].r - left[i].r; + dg = right[i].g - left[i].g; + db = right[i].b - left[i].b; + rslope = (dr << 8) / dx; + gslope = (dg << 8) / dx; + bslope = (db << 8) / dx; +#endif +#ifdef TEXMAP + u = left[i].u; + v = left[i].v; + du = right[i].u - left[i].u; + dv = right[i].v - left[i].v; + uslope = (du << 8) / dx; + vslope = (dv << 8) / dx; +#endif + + while(x <= right[i].x) { +#ifdef GOURAUD + /* drop the extra 8 bits when packing */ + int cr = r >> 8; + int cg = g >> 8; + int cb = b >> 8; + color = PACK_RGB16(cr, cg, cb); + r += rslope; + g += gslope; + b += bslope; +#endif +#ifdef TEXMAP + /* TODO */ + u += uslope; + v += vslope; +#endif + +#ifdef DEBUG_OVERDRAW + *pixptr++ += DEBUG_OVERDRAW; +#else + *pixptr++ = color; +#endif + x += 256; + } + } +} + -- 1.7.10.4