X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2F3dgfx%2F3dgfx.c;fp=src%2F3dgfx%2F3dgfx.c;h=ef569e6ea842244a154d2c945e8052194e22345e;hp=16024f8065a78d5eb20ac1383d5e50c7281f42dc;hb=650644eccabcdceb974c17d5fd19c0546eb753d3;hpb=659ca11730af4e7e5b1b350efa4198a9c42de287

diff --git a/src/3dgfx/3dgfx.c b/src/3dgfx/3dgfx.c
index 16024f8..ef569e6 100644
--- a/src/3dgfx/3dgfx.c
+++ b/src/3dgfx/3dgfx.c
@@ -70,6 +70,8 @@ struct g3d_state {
 
 	int vport[4];
 
+	uint16_t clear_color, clear_depth;
+
 	/* immediate mode */
 	int imm_prim;
 	int imm_numv, imm_pcount;
@@ -132,6 +134,8 @@ void g3d_reset(void)
 	g3d_light_ambient(0.1, 0.1, 0.1);
 
 	g3d_mtl_diffuse(1, 1, 1);
+
+	st->clear_depth = 65535;
 }
 
 void g3d_framebuffer(int width, int height, void *pixels)
@@ -156,7 +160,6 @@ void g3d_framebuffer(int width, int height, void *pixels)
 
 	st->width = width;
 	st->height = height;
-	st->pixels = pixels;
 
 	pfill_fb.pixels = pixels;
 	pfill_fb.width = width;
@@ -168,7 +171,6 @@ void g3d_framebuffer(int width, int height, void *pixels)
 /* set the framebuffer pointer, without resetting the size */
 void g3d_framebuffer_addr(void *pixels)
 {
-	st->pixels = pixels;
 	pfill_fb.pixels = pixels;
 }
 
@@ -180,6 +182,26 @@ void g3d_viewport(int x, int y, int w, int h)
 	st->vport[3] = h;
 }
 
+void g3d_clear_color(unsigned char r, unsigned char g, unsigned char b)
+{
+	st->clear_color = PACK_RGB16(r, g, b);
+}
+
+void g3d_clear_depth(uint16_t zval)
+{
+	st->clear_depth = zval;
+}
+
+void g3d_clear(unsigned int mask)
+{
+	if(mask & G3D_COLOR_BUFFER_BIT) {
+		memset16(pfill_fb.pixels, st->clear_color, pfill_fb.width * pfill_fb.height);
+	}
+	if(mask & G3D_DEPTH_BUFFER_BIT) {
+		memset16(pfill_zbuf, st->clear_depth, pfill_fb.width * pfill_fb.height);
+	}
+}
+
 void g3d_enable(unsigned int opt)
 {
 	st->opt |= opt;
@@ -545,7 +567,11 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 			if(v[i].w != 0.0f) {
 				v[i].x /= v[i].w;
 				v[i].y /= v[i].w;
-				/*v[i].z /= v[i].w;*/
+#ifdef ENABLE_ZBUFFER
+				if(st->opt & G3D_DEPTH_TEST) {
+					v[i].z /= v[i].w;
+				}
+#endif
 			}
 
 			/* viewport transformation */
@@ -555,6 +581,12 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 			/* convert pos to 24.8 fixed point */
 			pv[i].x = cround64(v[i].x * 256.0f);
 			pv[i].y = cround64(v[i].y * 256.0f);
+#ifdef ENABLE_ZBUFFER
+			if(st->opt & G3D_DEPTH_TEST) {
+				/* after div/w z is in [-1, 1], remap it to [0, 65535] */
+				pv[i].z = cround64(v[i].z * 32767.5f + 32767.5f);
+			}
+#endif
 			/* convert tex coords to 16.16 fixed point */
 			pv[i].u = cround64(v[i].u * 65536.0f);
 			pv[i].v = cround64(v[i].v * 65536.0f);
@@ -583,7 +615,7 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 		case 1:
 			if(st->opt & (G3D_ALPHA_BLEND | G3D_ADD_BLEND)) {
 				int r, g, b, inv_alpha;
-				g3d_pixel *dest = st->pixels + (pv[0].y >> 8) * st->width + (pv[0].x >> 8);
+				g3d_pixel *dest = pfill_fb.pixels + (pv[0].y >> 8) * st->width + (pv[0].x >> 8);
 				if(st->opt & G3D_ALPHA_BLEND) {
 					inv_alpha = 255 - pv[0].a;
 					r = ((int)pv[0].r * pv[0].a + G3D_UNPACK_R(*dest) * inv_alpha) >> 8;
@@ -599,7 +631,7 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 				}
 				*dest++ = G3D_PACK_RGB(r, g, b);
 			} else {
-				g3d_pixel *dest = st->pixels + (pv[0].y >> 8) * st->width + (pv[0].x >> 8);
+				g3d_pixel *dest = pfill_fb.pixels + (pv[0].y >> 8) * st->width + (pv[0].x >> 8);
 				*dest = G3D_PACK_RGB(pv[0].r, pv[0].g, pv[0].b);
 			}
 			break;
@@ -621,6 +653,11 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 			} else if(st->opt & G3D_ADD_BLEND) {
 				fill_mode |= POLYFILL_ADD_BIT;
 			}
+#ifdef ENABLE_ZBUFFER
+			if(st->opt & G3D_DEPTH_TEST) {
+				fill_mode |= POLYFILL_ZBUF_BIT;
+			}
+#endif
 			polyfill(fill_mode, pv, vnum);
 		}
 	}