X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2F3dgfx.c;h=083f5072e3c959b6244a275631e04bbc21597887;hp=39997475d7fa7eb3fca427c1cd0d1c09b3605090;hb=091586fb9501d613f621fceb70fa21ff97c4898e;hpb=1883deae4194ed84395bfb1102555b803a4f28e2

diff --git a/src/3dgfx.c b/src/3dgfx.c
index 3999747..083f507 100644
--- a/src/3dgfx.c
+++ b/src/3dgfx.c
@@ -3,6 +3,11 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
+#if defined(__WATCOMC__) || defined(_MSC_VER) || defined(__DJGPP__)
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
 #include "3dgfx.h"
 #include "gfxutil.h"
 #include "polyfill.h"
@@ -77,6 +82,7 @@ int g3d_init(void)
 		fprintf(stderr, "failed to allocate G3D context\n");
 		return -1;
 	}
+	st->opt = G3D_CLIP_FRUSTUM;
 	st->fill_mode = POLYFILL_FLAT;
 
 	for(i=0; i<G3D_NUM_MATRICES; i++) {
@@ -111,6 +117,13 @@ void g3d_framebuffer(int width, int height, void *pixels)
 	g3d_viewport(0, 0, width, height);
 }
 
+/* set the framebuffer pointer, without resetting the size */
+void g3d_framebuffer_addr(void *pixels)
+{
+	st->pixels = pixels;
+	pfill_fb.pixels = pixels;
+}
+
 void g3d_viewport(int x, int y, int w, int h)
 {
 	st->vport[0] = x;
@@ -398,18 +411,20 @@ void g3d_draw(int prim, const struct g3d_vertex *varr, int varr_size)
 void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 		const uint16_t *iarr, int iarr_size)
 {
-	int i, j, nfaces;
+	int i, j, vnum, nfaces;
 	struct pvertex pv[16];
 	struct g3d_vertex v[16];
-	int vnum = prim; /* primitive vertex counts correspond to enum values */
 	int mvtop = st->mtop[G3D_MODELVIEW];
 	int ptop = st->mtop[G3D_PROJECTION];
+	struct g3d_vertex *tmpv;
+
+	tmpv = alloca(prim * 6 * sizeof *tmpv);
 
 	/* calc the normal matrix */
 	memcpy(st->norm_mat, st->mat[G3D_MODELVIEW][mvtop], 16 * sizeof(float));
 	st->norm_mat[12] = st->norm_mat[13] = st->norm_mat[14] = 0.0f;
 
-	nfaces = (iarr ? iarr_size : varr_size) / vnum;
+	nfaces = (iarr ? iarr_size : varr_size) / prim;
 
 	for(j=0; j<nfaces; j++) {
 		vnum = prim;	/* reset vnum for each iteration */
@@ -427,22 +442,31 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 				v[i].u = v[i].nx * 0.5 + 0.5;
 				v[i].v = v[i].ny * 0.5 + 0.5;
 			}
+			if(st->opt & G3D_TEXTURE_MAT) {
+				float *mat = st->mat[G3D_TEXTURE][st->mtop[G3D_TEXTURE]];
+				float x = mat[0] * v[i].u + mat[4] * v[i].v + mat[12];
+				float y = mat[1] * v[i].u + mat[5] * v[i].v + mat[13];
+				float w = mat[3] * v[i].u + mat[7] * v[i].v + mat[15];
+				v[i].u = x / w;
+				v[i].v = y / w;
+			}
 			xform4_vec3(st->mat[G3D_PROJECTION][ptop], &v[i].x);
 		}
 
 		/* clipping */
-		for(i=0; i<6; i++) {
-			struct g3d_vertex tmpv[16];
-			memcpy(tmpv, v, vnum * sizeof *v);
-
-			if(clip_frustum(v, &vnum, tmpv, vnum, i) < 0) {
-				/* polygon completely outside of view volume. discard */
-				vnum = 0;
-				break;
+		if(st->opt & G3D_CLIP_FRUSTUM) {
+			for(i=0; i<6; i++) {
+				memcpy(tmpv, v, vnum * sizeof *v);
+
+				if(clip_frustum(v, &vnum, tmpv, vnum, i) < 0) {
+					/* polygon completely outside of view volume. discard */
+					vnum = 0;
+					break;
+				}
 			}
-		}
 
-		if(!vnum) continue;
+			if(!vnum) continue;
+		}
 
 		for(i=0; i<vnum; i++) {
 			if(v[i].w != 0.0f) {
@@ -499,7 +523,10 @@ void g3d_draw_indexed(int prim, const struct g3d_vertex *varr, int varr_size,
 			break;
 
 		case 2:
-			/* TODO: draw line */
+			{
+				uint16_t col = PACK_RGB16(pv[0].r, pv[0].g, pv[0].b);
+				draw_line(pv[0].x >> 8, pv[0].y >> 8, pv[1].x >> 8, pv[1].y >> 8, col);
+			}
 			break;
 
 		default: