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

diff --git a/src/gamescr.c b/src/gamescr.c
index 2744d5d..023114b 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -13,9 +13,9 @@
 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 unsigned char *tex, *shadelut;
 static uint16_t bnstate;
 
 #define MAX_SPR		4
@@ -36,10 +36,10 @@ void gamescr(void)
 
 	REG_DISPCNT = 4 | DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1;
 
-	vblperf_setcolor(0xff);
+	vblperf_setcolor(0xff);//192);
 
 	/* sprite setup */
-	spr_setup(16, 16, spr_game_pixels, spr_game_cmap);
+	spr_setup(32, 16, spr_game_pixels, spr_game_cmap);
 
 	wait_vblank();
 	spr_clear();
@@ -60,6 +60,8 @@ void gamescr(void)
 
 	tex = iwram_sbrk(32 * 32);
 	memcpy(tex, tuncross_pixels, 32 * 32);
+	shadelut = iwram_sbrk(256 * 8);
+	memcpy(shadelut, tuncross_shade, 256 * 8);
 
 	scale = 0x100;//230;
 	REG_BG2PA = scale;
@@ -90,10 +92,15 @@ void gamescr(void)
 	}
 }
 
+#define TUN_U(x)	((x) & 0x3f)
+#define TUN_V(x)	(((x) >> 6) & 0x3ff)
+#define TEXEL(x, y, lvl) \
+	shadelut[((int)tex[((y) << 5) + (x)] << 3) + (lvl)]
+
 __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, shade;
 	static int tunsweep;
 	uint16_t pptop, ppbot;
 	uint16_t *top, *bot;
@@ -107,9 +114,8 @@ static void draw_tunnel(void)
 	flip = tunsweep < 0;
 	tunturn = abs(tunsweep) & 0x1f;
 
-	zoffs = nframes;
-
-	uoffs = flip ? -nframes : nframes;
+	zoffs = num_vbl;
+	uoffs = (flip ? -num_vbl : num_vbl) >> 1;
 
 	top = vram[backbuf];
 	bot = vram[backbuf] + 159 * 240 / 2;
@@ -120,23 +126,24 @@ 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;
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				shade = depth >> 7;
+				tx = ~(angle - uoffs) & 0x1f;
 				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop = tex[(ty << 5) + tx];
-				tx = ((angle >> 1) + uoffs) & 0x1f;
-				ppbot = tex[(ty << 5) + tx];
-
-				angle = (tun >> 16) & 0xff;
-				depth = (tun >> 24) & 0xff;
-				tx = ~((angle >> 1) - uoffs) & 0x1f;
+				pptop = TEXEL(tx, ty, shade);
+				tx = (angle + uoffs) & 0x1f;
+				ppbot = TEXEL(tx, ty, shade);
+
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				shade = depth >> 7;
+				tx = ~(angle - uoffs) & 0x1f;
 				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-				tx = ((angle >> 1) + uoffs) & 0x1f;
-				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
+				pptop |= (uint16_t)TEXEL(tx, ty, shade) << 8;
+				tx = (angle + uoffs) & 0x1f;
+				ppbot |= (uint16_t)TEXEL(tx, ty, shade) << 8;
 
 				*top++ = pptop;
 				*bot++ = ppbot;
@@ -149,21 +156,23 @@ 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;
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				shade = depth >> 7;
+				tx = (angle - uoffs) & 0x1f;
 				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop = tex[(ty << 5) + tx];
-				tx = ~((angle >> 1) + uoffs) & 0x1f;
-				ppbot = tex[(ty << 5) + tx];
-
-				angle = (tun >> 16) & 0xff;
-				depth = (tun >> 24) & 0xff;
-				tx = ((angle >> 1) - uoffs) & 0x1f;
+				pptop = TEXEL(tx, ty, shade);
+				tx = ~(angle + uoffs) & 0x1f;
+				ppbot = TEXEL(tx, ty, shade);
+
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				shade = depth >> 7;
+				tx = (angle - uoffs) & 0x1f;
 				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-				tx = ~((angle >> 1) + uoffs) & 0x1f;
-				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
+				pptop |= (uint16_t)TEXEL(tx, ty, shade) << 8;
+				tx = ~(angle + uoffs) & 0x1f;
+				ppbot |= (uint16_t)TEXEL(tx, ty, shade) << 8;
 
 				*top++ = pptop;
 				*bot++ = ppbot;
@@ -180,6 +189,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) {
@@ -203,7 +214,7 @@ static void vblank(void)
 	if(bnstate & BN_B) rot += 2;
 
 
-	spr_oam(oam, 0, 512 + 256, x - 64, y - 64, SPR_256COL | SPR_SZ64 | SPR_DBLSZ |
+	spr_oam(oam, 0, 512, x - 64, y - 64, SPR_SZ64 | SPR_DBLSZ |
 			SPR_ROTSCL | SPR_ROTSCL_SEL(0));
 
 	mat[0] = COS(rot);