X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=23a8e21e8faf3e86245ae31cbe7c70edf44d4e47;hb=11d447b3ef2de519e646802c0721e07cd5596133;hp=ec4f3531c2fd10f4dc66272c4755112eddc3e888;hpb=64cde8e9b466d11e1257160483e765c0c1c96819;p=gbajam21

diff --git a/src/gamescr.c b/src/gamescr.c
index ec4f353..23a8e21 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;
@@ -24,9 +24,13 @@ static uint16_t oam[4 * MAX_SPR];
 static short x = 120, y = 80;
 static unsigned char rot;
 
+static int32_t tunrot;
+static int32_t tunmat[4], tunx, tuny;
+
 void gamescr(void)
 {
 	int i;
+	int32_t scale;
 	uint16_t *cdst;
 	unsigned char *csrc;
 
@@ -57,6 +61,14 @@ void gamescr(void)
 	tex = iwram_sbrk(32 * 32);
 	memcpy(tex, tuncross_pixels, 32 * 32);
 
+	scale = 0x100;//230;
+	REG_BG2PA = scale;
+	REG_BG2PB = 0;
+	REG_BG2PC = 0;
+	REG_BG2PD = scale;
+	REG_BG2X = (120 << 8) - scale * 120;
+	REG_BG2Y = (80 << 8) - scale * 80;
+
 	/*select_input(BN_DPAD);*/
 
 	mask(INTR_VBLANK);
@@ -78,69 +90,87 @@ void gamescr(void)
 	}
 }
 
-static int32_t bgmat[4];
-static int32_t bgx, bgy;
+#define TUN_U(x)	((x) & 0x3f)
+#define TUN_V(x)	(((x) >> 6) & 0x3ff)
 
 __attribute__((noinline, target("arm"), section(".iwram")))
 static void draw_tunnel(void)
 {
-	static short uoffs;
-	int i, j, tx, ty, angle, depth, zoffs;
+	int i, j, tx, ty, u, v, angle, depth, zoffs, uoffs, flip, tunturn;
+	static int tunsweep;
 	uint16_t pptop, ppbot;
 	uint16_t *top, *bot;
 	uint32_t tun, *tunptr;
 
-	zoffs = nframes;
+	//tunsweep = SIN(nframes) >> 4;
+
+	if((bnstate & BN_RT) && tunsweep > -31) tunsweep--;
+	if((bnstate & BN_LT) && tunsweep < 31) tunsweep++;
 
-	if(bnstate & BN_LT) uoffs++;
-	if(bnstate & BN_RT) uoffs--;
+	flip = tunsweep < 0;
+	tunturn = abs(tunsweep) & 0x1f;
 
-	bgmat[0] = COS(uoffs) << 1;
-	bgmat[1] = -SIN(uoffs) << 1;
-	bgmat[2] = SIN(uoffs) << 1;
-	bgmat[3] = COS(uoffs) << 1;
-	bgx = (120 << 8) - bgmat[0] * 120 + bgmat[1] * -80;
-	bgy = (80 << 8) - bgmat[2] * 120 + bgmat[3] * -80;
+	zoffs = num_vbl;
+	uoffs = (flip ? -num_vbl : num_vbl) >> 1;
 
 	top = vram[backbuf];
 	bot = vram[backbuf] + 159 * 240 / 2;
-	tunptr = tunmap;
-	for(i=0; i<80; i++) {
-#ifdef VBLBAR
-		top++;
-		bot++;
-		tunptr++;
-
-		for(j=1; j<240/2; j++) {
-#else
-		for(j=0; j<240/2; j++) {
-#endif
-			tun = *tunptr++;
-
-			angle = tun & 0xff;
-			depth = (tun >> 8) & 0xff;
-//			tx = ((angle >> 1) - uoffs) & 0x1f;
-			tx = (angle >> 1) & 0x1f;
-			ty = ((depth >> 1) + zoffs) & 0x1f;
-			pptop = tex[(ty << 5) + tx];
-//			tx = ~((angle >> 1) + uoffs) & 0x1f;
-			tx = ~(angle >> 1) & 0x1f;
-			ppbot = tex[(ty << 5) + tx];
-
-			angle = (tun >> 16) & 0xff;
-			depth = (tun >> 24) & 0xff;
-//			tx = ((angle >> 1) - uoffs) & 0x1f;
-			tx = (angle >> 1) & 0x1f;
-			ty = ((depth >> 1) + zoffs) & 0x1f;
-			pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-//			tx = ~((angle >> 1) + uoffs) & 0x1f;
-			tx = ~(angle >> 1) & 0x1f;
-			ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
-
-			*top++ = pptop;
-			*bot++ = ppbot;
+	tunptr = tunmap + tunturn * 9600;
+
+	if(flip) {
+		tunptr += 240/2;
+		for(i=0; i<80; i++) {
+			for(j=0; j<240/2; j++) {
+				tun = *--tunptr;
+
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				tx = ~(angle - uoffs) & 0x1f;
+				ty = ((depth >> 1) + zoffs) & 0x1f;
+				pptop = tex[(ty << 5) + tx];
+				tx = (angle + uoffs) & 0x1f;
+				ppbot = tex[(ty << 5) + tx];
+
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				tx = ~(angle - uoffs) & 0x1f;
+				ty = ((depth >> 1) + zoffs) & 0x1f;
+				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
+				tx = (angle + uoffs) & 0x1f;
+				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
+
+				*top++ = pptop;
+				*bot++ = ppbot;
+			}
+			bot -= 240;
+			tunptr += 240;
+		}
+	} else {
+		for(i=0; i<80; i++) {
+			for(j=0; j<240/2; j++) {
+				tun = *tunptr++;
+
+				angle = TUN_U(tun);
+				depth = TUN_V(tun);
+				tx = (angle - uoffs) & 0x1f;
+				ty = ((depth >> 1) + zoffs) & 0x1f;
+				pptop = tex[(ty << 5) + tx];
+				tx = ~(angle + uoffs) & 0x1f;
+				ppbot = tex[(ty << 5) + tx];
+
+				angle = TUN_U(tun >> 16);
+				depth = TUN_V(tun >> 16);
+				tx = (angle - uoffs) & 0x1f;
+				ty = ((depth >> 1) + zoffs) & 0x1f;
+				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
+				tx = ~(angle + uoffs) & 0x1f;
+				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
+
+				*top++ = pptop;
+				*bot++ = ppbot;
+			}
+			bot -= 240;
 		}
-		bot -= 240;
 	}
 }
 
@@ -151,12 +181,7 @@ static void vblank(void)
 	int16_t mat[4];
 	static short gate_speed;
 
-	REG_BG2PA = bgmat[0];
-	REG_BG2PB = bgmat[1];
-	REG_BG2PC = bgmat[2];
-	REG_BG2PD = bgmat[3];
-	REG_BG2X = bgx;
-	REG_BG2Y = bgy;
+	num_vbl++;
 
 	bnstate = ~REG_KEYINPUT;
 	if(bnstate & BN_DPAD) {
@@ -180,13 +205,14 @@ static void vblank(void)
 	if(bnstate & BN_A) rot -= 2;
 	if(bnstate & BN_B) rot += 2;
 
+
 	spr_oam(oam, 0, 512 + 256, x - 64, y - 64, SPR_256COL | SPR_SZ64 | SPR_DBLSZ |
 			SPR_ROTSCL | SPR_ROTSCL_SEL(0));
 
-	mat[0] = COS(rot) << 1;
-	mat[1] = -SIN(rot) << 1;
-	mat[2] = SIN(rot) << 1;
-	mat[3] = COS(rot) << 1;
+	mat[0] = COS(rot);
+	mat[1] = -SIN(rot);
+	mat[2] = SIN(rot);
+	mat[3] = COS(rot);
 	spr_transform(oam, 0, mat);