X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Finfcubes.c;h=dd1bd33a2b4ec83ea83b5c790c83471dab9949c6;hp=6ce74af083a5c60a3610a8a429c022ace7e6e7ba;hb=3398fc6c4188104048f99b650a6cb90beda9b6ed;hpb=1883deae4194ed84395bfb1102555b803a4f28e2

diff --git a/src/infcubes.c b/src/infcubes.c
index 6ce74af..dd1bd33 100644
--- a/src/infcubes.c
+++ b/src/infcubes.c
@@ -16,7 +16,7 @@ static void destroy(void);
 static void start(long trans_time);
 static void draw(void);
 static int gen_phong_tex(struct pimage *img, int xsz, int ysz, float sexp,
-		int dr, int dg, int db, int sr, int sg, int sb);
+		float offx, float offy,	int dr, int dg, int db, int sr, int sg, int sb);
 
 static struct screen scr = {
 	"infcubes",
@@ -49,7 +49,7 @@ static int init(void)
 	}
 	convimg_rgb24_rgb16(tex_inner.pixels, (unsigned char*)tex_inner.pixels, tex_inner.width, tex_inner.height);
 	*/
-	gen_phong_tex(&tex_inner, PHONG_TEX_SZ, PHONG_TEX_SZ, 5.0f, 10, 50, 92, 192, 192, 192);
+	gen_phong_tex(&tex_inner, PHONG_TEX_SZ, PHONG_TEX_SZ, 5.0f, 0, 0, 10, 50, 92, 192, 192, 192);
 
 	if(!(tex_outer.pixels = img_load_pixels("data/refmap1.jpg", &tex_outer.width,
 					&tex_outer.height, IMG_FMT_RGB24))) {
@@ -112,7 +112,8 @@ static void draw(void)
 
 	memset(fb_pixels, 0, fb_width * fb_height * 2);
 
-	g3d_polygon_mode(G3D_TEX);
+	g3d_polygon_mode(G3D_FLAT);
+	g3d_enable(G3D_TEXTURE_2D);
 	g3d_enable(G3D_TEXTURE_GEN);
 
 	g3d_push_matrix();
@@ -130,7 +131,7 @@ static void draw(void)
 }
 
 static int gen_phong_tex(struct pimage *img, int xsz, int ysz, float sexp,
-		int dr, int dg, int db, int sr, int sg, int sb)
+		float offx, float offy,	int dr, int dg, int db, int sr, int sg, int sb)
 {
 	int i, j;
 	float u, v, du, dv;
@@ -144,9 +145,9 @@ static int gen_phong_tex(struct pimage *img, int xsz, int ysz, float sexp,
 	du = 2.0f / (float)(xsz - 1);
 	dv = 2.0f / (float)(ysz - 1);
 
-	v = -1.0f;
+	v = -1.0f - offy;
 	for(i=0; i<ysz; i++) {
-		u = -1.0f;
+		u = -1.0f - offx;
 		for(j=0; j<xsz; j++) {
 			float d = sqrt(u * u + v * v);
 			float val = pow(cos(d * M_PI / 2.0f), sexp);