From: John Tsiombikas <nuclear@mutantstargoat.com>
Date: Mon, 3 Oct 2016 03:41:01 +0000 (+0300)
Subject: much better, not perfect
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=dce48eb322ddf2a3c3622fc132ece21ba7653da3

much better, not perfect
---

diff --git a/src/polyfill.c b/src/polyfill.c
index 7bffaa3..122b234 100644
--- a/src/polyfill.c
+++ b/src/polyfill.c
@@ -51,7 +51,7 @@ void polyfill_wire(struct pvertex *verts, int nverts)
 	}
 }
 
-static void scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *edge);
+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)
@@ -59,10 +59,9 @@ static void scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *ed
 void polyfill_flat(struct pvertex *pv, int nverts)
 {
 	int i;
-	int32_t y;
-	int topidx = 0, botidx = 0, sline;
+	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);*/
+	uint16_t color = PACK_RGB16(pv[0].r, pv[0].g, pv[0].b);
 
 	for(i=1; i<nverts; i++) {
 		if(pv[i].y < pv[topidx].y) topidx = i;
@@ -86,32 +85,39 @@ void polyfill_flat(struct pvertex *pv, int nverts)
 				right[idx].x = pv[i].x < pv[next].x ? pv[next].x : pv[i].x;
 			}
 		} else {
-			scan_edge(pv + i, pv + next, y0 > y1 ? left : right);
+			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;
+			}
 		}
 	}
 
-	y = pv[topidx].y;
-	while(y < pv[botidx].y) {
+	for(i=sltop; i<=slbot; i++) {
 		int32_t x;
 		uint16_t *pixptr;
 
-		sline = y >> 8;
-		x = left[sline].x;
-
-		pixptr = pimg_fb.pixels + sline * pimg_fb.width + (x >> 8);
+		x = left[i].x;
+		pixptr = pimg_fb.pixels + i * pimg_fb.width + (x >> 8);
 
-		while(x <= right[sline].x) {
+		while(x <= right[i].x) {
+#ifdef DEBUG_POLYFILL
 			*pixptr++ += 15;
+#else
+			*pixptr++ = color;
+#endif
 			x += 256;
 		}
-		y += 256;
 	}
 }
 
-static void scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *edge)
+static uint32_t scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *edge)
 {
-	int32_t x, y, dx, dy, slope;
-	int idx;
+	int i;
+	int32_t x, dx, dy, slope;
+	int32_t start_idx, end_idx;
 
 	if(v0->y > v1->y) {
 		struct pvertex *tmp = v0;
@@ -122,13 +128,15 @@ static void scan_edge(struct pvertex *v0, struct pvertex *v1, struct pvertex *ed
 	dy = v1->y - v0->y;
 	dx = v1->x - v0->x;
 	slope = (dx << 8) / dy;
-	idx = v0->y >> 8;
+
+	start_idx = v0->y >> 8;
+	end_idx = v1->y >> 8;
 
 	x = v0->x;
-	y = v0->y;
-	while(y <= v1->y) {
-		edge[idx++].x = x;
+	for(i=start_idx; i<end_idx; i++) {
+		edge[i].x = x;
 		x += slope;
-		y += 256;
 	}
+
+	return (uint32_t)start_idx | ((uint32_t)(end_idx - 1) << 16);
 }
diff --git a/src/polytest.c b/src/polytest.c
index b81e9aa..826b0b0 100644
--- a/src/polytest.c
+++ b/src/polytest.c
@@ -49,9 +49,12 @@ static int init(void)
 	gen_cube(&cube, 1.0);
 	gen_torus(&torus, 1.0, 0.25, 24, 12);
 
+#ifdef DEBUG_POLYFILL
 	lowres_width = fb_width / LOWRES_SCALE;
 	lowres_height = fb_height / LOWRES_SCALE;
 	lowres_pixels = malloc(lowres_width * lowres_height * 2);
+	scr.draw = draw_debug;
+#endif
 
 	return 0;
 }
@@ -79,7 +82,7 @@ static void update(void)
 	static unsigned int prev_bmask;
 
 	if(mouse_bmask) {
-		if(mouse_bmask ^ prev_bmask == 0) {
+		if((mouse_bmask ^ prev_bmask) == 0) {
 			int dx = mouse_x - prev_mx;
 			int dy = mouse_y - prev_my;
 
@@ -97,10 +100,30 @@ static void update(void)
 	prev_bmask = mouse_bmask;
 }
 
+
 static void draw(void)
 {
 	update();
 
+	memset(fb_pixels, 0, fb_width * fb_height * 2);
+
+	g3d_matrix_mode(G3D_MODELVIEW);
+	g3d_load_identity();
+	g3d_translate(0, 0, -3);
+	g3d_rotate(phi, 1, 0, 0);
+	g3d_rotate(theta, 0, 1, 0);
+
+	zsort(&torus);
+	draw_mesh(&torus);
+
+	/*draw_mesh(&cube);*/
+	swap_buffers(fb_pixels);
+}
+
+static void draw_debug(void)
+{
+	update();
+
 	memset(lowres_pixels, 0, lowres_width * lowres_height * 2);
 
 	g3d_matrix_mode(G3D_MODELVIEW);