X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=39ed733439ba3bc41cd0fe3c204f750e4f46ed98;hb=df059b32b82103907f155391b779278e10b3db61;hp=1b11c25796d657fbf863aedf20d4273313cfe007;hpb=622fc6ef720a41a066e1bfcbdc6e003609da2da7;p=gbajam21

diff --git a/src/gamescr.c b/src/gamescr.c
index 1b11c25..39ed733 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -1,25 +1,49 @@
 #include <stdlib.h>
 #include <string.h>
 #include "gbaregs.h"
+#include "game.h"
 #include "dma.h"
 #include "data.h"
 #include "util.h"
 #include "intr.h"
+#include "input.h"
+#include "sprite.h"
 #include "debug.h"
 
+static void draw_tunnel(void);
+static void vblank(void);
+
+static int nframes, 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;
+
+#define MAX_SPR		4
+static uint16_t oam[4 * MAX_SPR];
+
+static short x = 120, y = 80;
+static unsigned char rot;
+
 void gamescr(void)
 {
-	int i, j, tx, ty, angle, depth, nframes, backbuf, zoffs;
-	static uint16_t *vram[] = { (uint16_t*)VRAM_LFB_FB0_ADDR, (uint16_t*)VRAM_LFB_FB1_ADDR };
-	uint16_t *cdst, *top, *bot;
+	int i;
+	uint16_t *cdst;
 	unsigned char *csrc;
-	uint32_t tun, *tunptr;
-	unsigned char *tex;
 
-	REG_DISPCNT = 4 | DISPCNT_BG2 | DISPCNT_FB1;
+	REG_DISPCNT = 4 | DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1;
 
 	vblperf_setcolor(0xff);
 
+	/* sprite setup */
+	spr_setup(16, 16, spr_game_pixels, spr_game_cmap);
+
+	wait_vblank();
+	spr_clear();
+	spr_oam_clear(oam, 0);
+	spr_oam_clear(oam, 1);
+	spr_oam_clear(oam, 2);
+	spr_oam_clear(oam, 3);
+
 	cdst = (uint16_t*)CRAM_BG_ADDR;
 	csrc = tuncross_cmap;
 	for(i=0; i<256; i++) {
@@ -33,45 +57,19 @@ void gamescr(void)
 	tex = iwram_sbrk(32 * 32);
 	memcpy(tex, tuncross_pixels, 32 * 32);
 
+	/*select_input(BN_DPAD);*/
+
+	mask(INTR_VBLANK);
+	screen_vblank = vblank;
+	unmask(INTR_VBLANK);
+
 	nframes = 0;
 	for(;;) {
 		backbuf = ++nframes & 1;
 
-		zoffs = nframes << 1;
-
-		top = vram[backbuf];
-		bot = vram[backbuf] + 159 * 240 / 2;
-		tunptr = tunmap;
-		for(i=0; i<80; i++) {
-			top++;
-			bot++;
-			tunptr++;
-			for(j=1; j<240/2; j++) {
-				uint16_t pptop, ppbot;
-
-				tun = *tunptr++;
-
-				angle = tun & 0xff;
-				depth = (tun >> 8) & 0xff;
-				tx = ((angle >> 1) + zoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop = tex[(ty << 5) + tx];
-				tx = ((angle >> 1) - zoffs) & 0x1f;
-				ppbot = tex[(ty << 5) + tx];
-
-				angle = (tun >> 16) & 0xff;
-				depth = (tun >> 24) & 0xff;
-				tx = ((angle >> 1) + zoffs) & 0x1f;
-				ty = ((depth >> 1) + zoffs) & 0x1f;
-				pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
-				tx = ((angle >> 1) - zoffs) & 0x1f;
-				ppbot |= (uint16_t)tex[(ty << 5) + tx] << 8;
-
-				*top++ = pptop;
-				*bot++ = ppbot;
-			}
-			bot -= 240;
-		}
+		bnstate = ~REG_KEYINPUT;
+
+		draw_tunnel();
 
 		vblperf_end();
 		wait_vblank();
@@ -79,3 +77,97 @@ void gamescr(void)
 		vblperf_begin();
 	}
 }
+
+__attribute__((noinline, target("arm"), section(".iwram")))
+static void draw_tunnel(void)
+{
+	static int uoffs;
+	int i, j, tx, ty, angle, depth, zoffs;
+	uint16_t pptop, ppbot;
+	uint16_t *top, *bot;
+	uint32_t tun, *tunptr;
+
+	zoffs = nframes;
+
+	if(bnstate & BN_LT) uoffs++;
+	if(bnstate & BN_RT) uoffs--;
+
+	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;
+			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;
+			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;
+
+			*top++ = pptop;
+			*bot++ = ppbot;
+		}
+		bot -= 240;
+	}
+}
+
+__attribute__((noinline, target("arm"), section(".iwram")))
+static void vblank(void)
+{
+	uint16_t bnstate;
+	int16_t mat[4];
+	static short gate_speed;
+
+	bnstate = ~REG_KEYINPUT;
+	if(bnstate & BN_DPAD) {
+		if(gate_speed < 5) {
+			gate_speed++;
+		}
+
+		if(bnstate & BN_LEFT) x -= gate_speed;
+		if(bnstate & BN_RIGHT) x += gate_speed;
+		if(bnstate & BN_UP) y -= gate_speed;
+		if(bnstate & BN_DOWN) y += gate_speed;
+
+		if(x < 0) x = 0;
+		if(x > 239) x = 239;
+		if(y < 0) y = 0;
+		if(y > 159) y = 159;
+	} else {
+		gate_speed = 0;
+	}
+
+	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;
+	spr_transform(oam, 0, mat);
+
+
+	dma_copy16(3, (void*)OAM_ADDR, oam, sizeof oam / 2, 0);
+}