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

diff --git a/src/mesh.c b/src/mesh.c
index bde8266..af5936e 100644
--- a/src/mesh.c
+++ b/src/mesh.c
@@ -304,7 +304,6 @@ int gen_cube_mesh(struct g3d_mesh *mesh, float sz, int sub)
 	int i;
 	struct g3d_mesh *m;
 	struct g3d_mesh tmpmesh;
-	float xform[16];
 	static float rotface[][4] = {
 		{0, 0, 1, 0},
 		{90, 0, 1, 0},
@@ -324,8 +323,7 @@ int gen_cube_mesh(struct g3d_mesh *mesh, float sz, int sub)
 		g3d_load_identity();
 		g3d_rotate(rotface[i][0], rotface[i][1], rotface[i][2], rotface[i][3]);
 		g3d_translate(0, 0, sz / 2.0f);
-		g3d_get_matrix(G3D_MODELVIEW, xform);
-		apply_mesh_xform(m, xform);
+		apply_mesh_xform(m, g3d_get_matrix(G3D_MODELVIEW, 0));
 		if(i > 0) {
 			if(append_mesh(mesh, m) == -1) {
 				return -1;
@@ -394,6 +392,7 @@ int gen_torus_mesh(struct g3d_mesh *mesh, float rad, float ringrad, int usub, in
 			int chess = (i & 1) == (j & 1);
 
 			torusvec(&vptr->x, theta, phi, rad, ringrad);
+			vptr->w = 1.0f;
 
 			vptr->nx = (vptr->x - rcent[0]) / ringrad;
 			vptr->ny = (vptr->y - rcent[1]) / ringrad;