X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fmesh.c;h=88c6edc6221fa97a08882d82e1e55d83bc13b398;hp=af5936e8c7c69972a89b40d3eb87fa4934df4368;hb=ae96c724e905181ca10441a63b1dfe9c2fc5d2ea;hpb=45f6f46fe758d15aafccdb69ae837fc7d84ee466

diff --git a/src/mesh.c b/src/mesh.c
index af5936e..88c6edc 100644
--- a/src/mesh.c
+++ b/src/mesh.c
@@ -5,49 +5,59 @@
 #include "mesh.h"
 #include "3dgfx.h"
 
+void free_mesh(struct g3d_mesh *mesh)
+{
+	destroy_mesh(mesh);
+	free(mesh);
+}
+
+void destroy_mesh(struct g3d_mesh *mesh)
+{
+	free(mesh->varr);
+	free(mesh->iarr);
+}
+
 static struct {
+	int prim;
 	struct g3d_vertex *varr;
 	const float *xform;
 } zsort_cls;
 
 static int zsort_cmp(const void *aptr, const void *bptr)
 {
+	int i;
+	float za = 0.0f;
+	float zb = 0.0f;
 	const float *m = zsort_cls.xform;
-
 	const struct g3d_vertex *va = (const struct g3d_vertex*)aptr;
 	const struct g3d_vertex *vb = (const struct g3d_vertex*)bptr;
 
-	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;
-	++vb;
-
-	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];
-
+	for(i=0; i<zsort_cls.prim; i++) {
+		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];
+		++va;
+		++vb;
+	}
 	return za - zb;
 }
 
 static int zsort_indexed_cmp(const void *aptr, const void *bptr)
 {
+	int i;
+	float za = 0.0f;
+	float zb = 0.0f;
 	const uint16_t *a = (const uint16_t*)aptr;
 	const uint16_t *b = (const uint16_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];
+	for(i=0; i<zsort_cls.prim; i++) {
+		const struct g3d_vertex *va = zsort_cls.varr + a[i];
+		const struct g3d_vertex *vb = zsort_cls.varr + b[i];
 
+		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;
 }
 
@@ -56,6 +66,7 @@ void zsort_mesh(struct g3d_mesh *m)
 {
 	zsort_cls.varr = m->varr;
 	zsort_cls.xform = g3d_get_matrix(G3D_MODELVIEW, 0);
+	zsort_cls.prim = m->prim;
 
 	if(m->iarr) {
 		int nfaces = m->icount / m->prim;
@@ -224,6 +235,79 @@ void normalize_mesh_normals(struct g3d_mesh *mesh)
 	}
 }
 
+
+static void sphvec(float *res, float theta, float phi, float rad)
+{
+	theta = -theta;
+	res[0] = sin(theta) * sin(phi);
+	res[1] = cos(phi);
+	res[2] = cos(theta) * sin(phi);
+}
+
+int gen_sphere_mesh(struct g3d_mesh *mesh, float rad, int usub, int vsub)
+{
+	int i, j;
+	int nfaces, uverts, vverts;
+	struct g3d_vertex *vptr;
+	uint16_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;
+
+	if(!(mesh->varr = malloc(mesh->vcount * sizeof *mesh->varr))) {
+		fprintf(stderr, "gen_sphere_mesh: failed to allocate vertex buffer (%d vertices)\n", mesh->vcount);
+		return -1;
+	}
+	if(!(mesh->iarr = malloc(mesh->icount * sizeof *mesh->iarr))) {
+		fprintf(stderr, "gen_sphere_mesh: failed to allocate index buffer (%d indices)\n", mesh->icount);
+		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;
+
+		for(j=0; j<vverts; j++) {
+			float v = (float)j / (float)(vverts - 1);
+			float phi = v * M_PI;
+			int chess = (i & 1) == (j & 1);
+
+			sphvec(&vptr->x, theta, phi, rad);
+			vptr->w = 1.0f;
+
+			vptr->nx = vptr->x / rad;
+			vptr->ny = vptr->y / rad;
+			vptr->nz = vptr->z / rad;
+			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;
+}
+
 int gen_plane_mesh(struct g3d_mesh *m, float width, float height, int usub, int vsub)
 {
 	int i, j;