X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=6eee71310277477aca6faf622fcfb34f15d21af7;hb=a87d38e5a23ab489b6486ed4c62f30054719d39e;hp=2744d5d5111fe47af88415005d1b8f50fd96b5c9;hpb=e8d7821317677f1d0fd6ee9efa9b9ef0ef006d01;p=gbajam21

diff --git a/src/gamescr.c b/src/gamescr.c
index 2744d5d..6eee713 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -13,7 +13,7 @@
 static void draw_tunnel(void);
 static void vblank(void);
 
-static int nframes, backbuf;
+static int nframes, num_vbl, backbuf;
 static uint16_t *vram[] = { (uint16_t*)VRAM_LFB_FB0_ADDR, (uint16_t*)VRAM_LFB_FB1_ADDR };
 static unsigned char *tex;
 static uint16_t bnstate;
@@ -90,10 +90,13 @@ void gamescr(void)
 	}
 }
 
+#define TUN_U(x)	((x) & 0x3f)
+#define TUN_V(x)	(((x) >> 7) & 0x1ff)
+
 __attribute__((noinline, target("arm"), section(".iwram")))
 static void draw_tunnel(void)
 {
-	int i, j, tx, ty, angle, depth, zoffs, uoffs, flip, tunturn;
+	int i, j, tx, ty, u, v, angle, depth, zoffs, uoffs, flip, tunturn;
 	static int tunsweep;
 	uint16_t pptop, ppbot;
 	uint16_t *top, *bot;
@@ -107,9 +110,8 @@ static void draw_tunnel(void)
 	flip = tunsweep < 0;
 	tunturn = abs(tunsweep) & 0x1f;
 
-	zoffs = nframes;
-
-	uoffs = flip ? -nframes : nframes;
+	zoffs = num_vbl;
+	uoffs = 0;//(flip ? -num_vbl : num_vbl) >> 2;
 
 	top = vram[backbuf];
 	bot = vram[backbuf] + 159 * 240 / 2;
@@ -120,22 +122,21 @@ static void draw_tunnel(void)
 		for(i=0; i<80; i++) {
 			for(j=0; j<240/2; j++) {
 				tun = *--tunptr;
-				tun = (tun >> 16) | (tun << 16);
 
-				angle = tun & 0xff;
-				depth = (tun >> 8) & 0xff;
-				tx = ~((angle >> 1) - uoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				tx = ~(angle - uoffs) & 0x1f;
+				ty = (depth + zoffs) & 0x1f;
 				pptop = tex[(ty << 5) + tx];
-				tx = ((angle >> 1) + uoffs) & 0x1f;
+				tx = (angle + uoffs) & 0x1f;
 				ppbot = tex[(ty << 5) + tx];
 
-				angle = (tun >> 16) & 0xff;
-				depth = (tun >> 24) & 0xff;
-				tx = ~((angle >> 1) - uoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				tx = ~(angle - uoffs) & 0x1f;
+				ty = (depth + zoffs) & 0x1f;
 				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-				tx = ((angle >> 1) + uoffs) & 0x1f;
+				tx = (angle + uoffs) & 0x1f;
 				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
 
 				*top++ = pptop;
@@ -149,20 +150,20 @@ static void draw_tunnel(void)
 			for(j=0; j<240/2; j++) {
 				tun = *tunptr++;
 
-				angle = tun & 0xff;
-				depth = (tun >> 8) & 0xff;
-				tx = ((angle >> 1) - uoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				tx = (angle - uoffs) & 0x1f;
+				ty = (depth + zoffs) & 0x1f;
 				pptop = tex[(ty << 5) + tx];
-				tx = ~((angle >> 1) + uoffs) & 0x1f;
+				tx = ~(angle + uoffs) & 0x1f;
 				ppbot = tex[(ty << 5) + tx];
 
-				angle = (tun >> 16) & 0xff;
-				depth = (tun >> 24) & 0xff;
-				tx = ((angle >> 1) - uoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				tx = (angle - uoffs) & 0x1f;
+				ty = (depth + zoffs) & 0x1f;
 				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-				tx = ~((angle >> 1) + uoffs) & 0x1f;
+				tx = ~(angle + uoffs) & 0x1f;
 				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
 
 				*top++ = pptop;
@@ -180,6 +181,8 @@ static void vblank(void)
 	int16_t mat[4];
 	static short gate_speed;
 
+	num_vbl++;
+
 	bnstate = ~REG_KEYINPUT;
 	if(bnstate & BN_DPAD) {
 		if(gate_speed < 5) {