X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fpolytest.c;h=dfca5ef2a5978aeb3e52d1e3287ccdd5bc290525;hp=0d5187d868cdb58b5a9a762062341a1410118cca;hb=45f6f46fe758d15aafccdb69ae837fc7d84ee466;hpb=9e546fcbdc870e396abeb6eaacaa7bc4054a61f0

diff --git a/src/polytest.c b/src/polytest.c
index 0d5187d..dfca5ef 100644
--- a/src/polytest.c
+++ b/src/polytest.c
@@ -7,22 +7,14 @@
 #include "3dgfx.h"
 #include "gfxutil.h"
 #include "polyfill.h"	/* just for struct pimage */
-
-struct mesh {
-	int prim;
-	struct g3d_vertex *varr;
-	int16_t *iarr;
-	int vcount, icount;
-};
+#include "cfgopt.h"
+#include "mesh.h"
+#include "bsptree.h"
 
 static int init(void);
 static void destroy(void);
 static void start(long trans_time);
 static void draw(void);
-static void draw_mesh(struct mesh *mesh);
-static int gen_cube(struct mesh *mesh, float sz);
-static int gen_torus(struct mesh *mesh, float rad, float ringrad, int usub, int vsub);
-static void zsort(struct mesh *m);
 static void draw_lowres_raster(void);
 static int gen_texture(struct pimage *img, int xsz, int ysz);
 
@@ -34,8 +26,10 @@ static struct screen scr = {
 	draw
 };
 
-static float theta, phi = 25;
-static struct mesh cube, torus;
+static float cam_theta, cam_phi = 25;
+static float cam_dist = 3;
+static struct g3d_mesh cube, torus;
+static struct bsptree torus_bsp;
 
 static struct pimage tex;
 
@@ -52,14 +46,20 @@ static int init(void)
 {
 	int i;
 
-	gen_cube(&cube, 1.0);
-	gen_torus(&torus, 1.0, 0.25, 24, 12);
+	gen_cube_mesh(&cube, 1.0, 0);
+	gen_torus_mesh(&torus, 1.0, 0.25, 24, 12);
 	/* scale texcoords */
 	for(i=0; i<torus.vcount; i++) {
 		torus.varr[i].u *= 4.0;
 		torus.varr[i].v *= 2.0;
 	}
 
+	init_bsp(&torus_bsp);
+	if(bsp_add_mesh(&torus_bsp, &torus) == -1) {
+		fprintf(stderr, "failed to construct torus BSP tree\n");
+		return -1;
+	}
+
 	gen_texture(&tex, 128, 128);
 
 #ifdef DEBUG_POLYFILL
@@ -78,6 +78,7 @@ static void destroy(void)
 	free(cube.varr);
 	free(torus.varr);
 	free(torus.iarr);
+	destroy_bsp(&torus_bsp);
 }
 
 static void start(long trans_time)
@@ -95,49 +96,46 @@ static void start(long trans_time)
 
 static void update(void)
 {
-	static int prev_mx, prev_my;
-	static unsigned int prev_bmask;
-
-	if(mouse_bmask) {
-		if((mouse_bmask ^ prev_bmask) == 0) {
-			int dx = mouse_x - prev_mx;
-			int dy = mouse_y - prev_my;
-
-			if(dx || dy) {
-				theta += dx * 1.0;
-				phi += dy * 1.0;
-
-				if(phi < -90) phi = -90;
-				if(phi > 90) phi = 90;
-			}
-		}
-	}
-	prev_mx = mouse_x;
-	prev_my = mouse_y;
-	prev_bmask = mouse_bmask;
+	mouse_orbit_update(&cam_theta, &cam_phi, &cam_dist);
 }
 
 
 static void draw(void)
 {
+	float vdir[3];
+	float mat[16];
+
 	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);
+	g3d_translate(0, 0, -cam_dist);
+	if(opt.sball) {
+		g3d_mult_matrix(sball_matrix);
+	} else {
+		g3d_rotate(cam_phi, 1, 0, 0);
+		g3d_rotate(cam_theta, 0, 1, 0);
+	}
+
+	/* calc world-space view direction */
+	g3d_get_matrix(G3D_MODELVIEW, mat);
+	/* transform (0, 0, -1) with transpose(mat3x3) */
+	vdir[0] = -mat[2];
+	vdir[1] = -mat[6];
+	vdir[2] = -mat[10];
+
 
 	g3d_light_pos(0, -10, 10, 20);
 
-	zsort(&torus);
+	zsort_mesh(&torus);
 
 	g3d_mtl_diffuse(0.4, 0.7, 1.0);
 	g3d_set_texture(tex.width, tex.height, tex.pixels);
 
-	draw_mesh(&torus);
+	/*draw_mesh(&torus);*/
+	draw_bsp(&torus_bsp, vdir[0], vdir[1], vdir[2]);
 
 	/*draw_mesh(&cube);*/
 	swap_buffers(fb_pixels);
@@ -151,9 +149,9 @@ static void draw_debug(void)
 
 	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);
+	g3d_translate(0, 0, -cam_dist);
+	g3d_rotate(cam_phi, 1, 0, 0);
+	g3d_rotate(cam_theta, 0, 1, 0);
 
 	g3d_framebuffer(lowres_width, lowres_height, lowres_pixels);
 	/*zsort(&torus);*/
@@ -171,202 +169,6 @@ static void draw_debug(void)
 	swap_buffers(fb_pixels);
 }
 
-static void draw_mesh(struct mesh *mesh)
-{
-	if(mesh->iarr) {
-		g3d_draw_indexed(mesh->prim, mesh->varr, mesh->vcount, mesh->iarr, mesh->icount);
-	} else {
-		g3d_draw(mesh->prim, mesh->varr, mesh->vcount);
-	}
-}
-
-#define NORMAL(vp, x, y, z) do { vp->nx = x; vp->ny = y; vp->nz = z; } while(0)
-#define COLOR(vp, cr, cg, cb) do { vp->r = cr; vp->g = cg; vp->b = cb; } while(0)
-#define TEXCOORD(vp, tu, tv) do { vp->u = tu; vp->v = tv; } while(0)
-#define VERTEX(vp, vx, vy, vz) \
-	do { \
-		vp->x = vx; vp->y = vy; vp->z = vz; vp->w = 1.0f; \
-		++vp; \
-	} while(0)
-
-static int gen_cube(struct mesh *mesh, float sz)
-{
-	struct g3d_vertex *vptr;
-	float hsz = sz / 2.0;
-
-	mesh->prim = G3D_QUADS;
-	mesh->iarr = 0;
-	mesh->icount = 0;
-
-	mesh->vcount = 24;
-	if(!(mesh->varr = malloc(mesh->vcount * sizeof *mesh->varr))) {
-		return -1;
-	}
-	vptr = mesh->varr;
-
-	/* -Z */
-	NORMAL(vptr, 0, 0, -1);
-	COLOR(vptr, 255, 0, 255);
-	VERTEX(vptr, hsz, -hsz, -hsz);
-	VERTEX(vptr, -hsz, -hsz, -hsz);
-	VERTEX(vptr, -hsz, hsz, -hsz);
-	VERTEX(vptr, hsz, hsz, -hsz);
-	/* -Y */
-	NORMAL(vptr, 0, -1, 0);
-	COLOR(vptr, 0, 255, 255);
-	VERTEX(vptr, -hsz, -hsz, -hsz);
-	VERTEX(vptr, hsz, -hsz, -hsz);
-	VERTEX(vptr, hsz, -hsz, hsz);
-	VERTEX(vptr, -hsz, -hsz, hsz);
-	/* -X */
-	NORMAL(vptr, -1, 0, 0);
-	COLOR(vptr, 255, 255, 0);
-	VERTEX(vptr, -hsz, -hsz, -hsz);
-	VERTEX(vptr, -hsz, -hsz, hsz);
-	VERTEX(vptr, -hsz, hsz, hsz);
-	VERTEX(vptr, -hsz, hsz, -hsz);
-	/* +X */
-	NORMAL(vptr, 1, 0, 0);
-	COLOR(vptr, 255, 0, 0);
-	VERTEX(vptr, hsz, -hsz, hsz);
-	VERTEX(vptr, hsz, -hsz, -hsz);
-	VERTEX(vptr, hsz, hsz, -hsz);
-	VERTEX(vptr, hsz, hsz, hsz);
-	/* +Y */
-	NORMAL(vptr, 0, 1, 0);
-	COLOR(vptr, 0, 255, 0);
-	VERTEX(vptr, -hsz, hsz, hsz);
-	VERTEX(vptr, hsz, hsz, hsz);
-	VERTEX(vptr, hsz, hsz, -hsz);
-	VERTEX(vptr, -hsz, hsz, -hsz);
-	/* +Z */
-	NORMAL(vptr, 0, 0, 1);
-	COLOR(vptr, 0, 0, 255);
-	VERTEX(vptr, -hsz, -hsz, hsz);
-	VERTEX(vptr, hsz, -hsz, hsz);
-	VERTEX(vptr, hsz, hsz, hsz);
-	VERTEX(vptr, -hsz, hsz, hsz);
-
-	return 0;
-}
-
-static void torusvec(float *res, float theta, float phi, float mr, float rr)
-{
-	float rx, ry, rz;
-	theta = -theta;
-
-	rx = -cos(phi) * rr + mr;
-	ry = sin(phi) * rr;
-	rz = 0.0f;
-
-	res[0] = rx * sin(theta) + rz * cos(theta);
-	res[1] = ry;
-	res[2] = -rx * cos(theta) + rz * sin(theta);
-}
-
-static int gen_torus(struct mesh *mesh, float rad, float ringrad, int usub, int vsub)
-{
-	int i, j;
-	int nfaces, uverts, vverts;
-	struct g3d_vertex *vptr;
-	int16_t *iptr;
-
-	mesh->prim = G3D_QUADS;
-
-	if(usub < 4) usub = 4;
-	if(vsub < 2) vsub = 2;
-
-	uverts = usub + 1;
-	vverts = vsub + 1;
-
-	mesh->vcount = uverts * vverts;
-	nfaces = usub * vsub;
-	mesh->icount = nfaces * 4;
-
-	printf("generating torus with %d faces (%d vertices)\n", nfaces, mesh->vcount);
-
-	if(!(mesh->varr = malloc(mesh->vcount * sizeof *mesh->varr))) {
-		return -1;
-	}
-	if(!(mesh->iarr = malloc(mesh->icount * sizeof *mesh->iarr))) {
-		return -1;
-	}
-	vptr = mesh->varr;
-	iptr = mesh->iarr;
-
-	for(i=0; i<uverts; i++) {
-		float u = (float)i / (float)(uverts - 1);
-		float theta = u * 2.0 * M_PI;
-		float rcent[3];
-
-		torusvec(rcent, theta, 0, rad, 0);
-
-		for(j=0; j<vverts; j++) {
-			float v = (float)j / (float)(vverts - 1);
-			float phi = v * 2.0 * M_PI;
-			int chess = (i & 1) == (j & 1);
-
-			torusvec(&vptr->x, theta, phi, rad, ringrad);
-
-			vptr->nx = (vptr->x - rcent[0]) / ringrad;
-			vptr->ny = (vptr->y - rcent[1]) / ringrad;
-			vptr->nz = (vptr->z - rcent[2]) / ringrad;
-			vptr->u = u;
-			vptr->v = v;
-			vptr->r = chess ? 255 : 64;
-			vptr->g = 128;
-			vptr->b = chess ? 64 : 255;
-			++vptr;
-
-			if(i < usub && j < vsub) {
-				int idx = i * vverts + j;
-				*iptr++ = idx;
-				*iptr++ = idx + 1;
-				*iptr++ = idx + vverts + 1;
-				*iptr++ = idx + vverts;
-			}
-		}
-	}
-	return 0;
-}
-
-
-static struct {
-	struct g3d_vertex *varr;
-	const float *xform;
-} zsort_cls;
-
-static int zsort_cmp(const void *aptr, const void *bptr)
-{
-	const int16_t *a = (const int16_t*)aptr;
-	const int16_t *b = (const int16_t*)bptr;
-
-	const float *m = zsort_cls.xform;
-
-	const struct g3d_vertex *va = zsort_cls.varr + a[0];
-	const struct g3d_vertex *vb = zsort_cls.varr + b[0];
-
-	float za = m[2] * va->x + m[6] * va->y + m[10] * va->z + m[14];
-	float zb = m[2] * vb->x + m[6] * vb->y + m[10] * vb->z + m[14];
-
-	va = zsort_cls.varr + a[2];
-	vb = zsort_cls.varr + b[2];
-
-	za += m[2] * va->x + m[6] * va->y + m[10] * va->z + m[14];
-	zb += m[2] * vb->x + m[6] * vb->y + m[10] * vb->z + m[14];
-
-	return za - zb;
-}
-
-static void zsort(struct mesh *m)
-{
-	int nfaces = m->icount / m->prim;
-
-	zsort_cls.varr = m->varr;
-	zsort_cls.xform = g3d_get_matrix(G3D_MODELVIEW, 0);
-
-	qsort(m->iarr, nfaces, m->prim * sizeof *m->iarr, zsort_cmp);
-}
 
 static void draw_huge_pixel(uint16_t *dest, int dest_width, uint16_t color)
 {