X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=9e9d6e1ec3f98925f205b20ce495ed972cfa5665;hb=ff74cf463fa44906add9344891096cada0970205;hp=330331eb63450429cd8965d2fffb6f3b8967f688;hpb=4f58871ec2e25fb8cd7dfc19d1e4999453cf9555;p=gbajam21

diff --git a/src/gamescr.c b/src/gamescr.c
index 330331e..9e9d6e1 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -1,24 +1,52 @@
+#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"
 
-#define present(x) \
-	do { \
-		REG_DISPCNT = DISPCNT_BG2 | 4 | ((x) << 4); \
-	} while(0)
+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;
+
+static int32_t tunrot;
+static int32_t tunmat[4], tunx, tuny;
 
 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 };
+	int i;
+	int32_t scale;
 	uint16_t *cdst;
 	unsigned char *csrc;
-	uint32_t tun, *tunptr;
 
-	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;
@@ -27,39 +55,146 @@ void gamescr(void)
 		csrc += 3;
 	}
 
+	fillblock_16byte(vram[0], 0xffffffff, 240 * 160 / 16);
+	fillblock_16byte(vram[1], 0xffffffff, 240 * 160 / 16);
+
+	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);
+	screen_vblank = vblank;
+	unmask(INTR_VBLANK);
+
 	nframes = 0;
 	for(;;) {
 		backbuf = ++nframes & 1;
 
-		zoffs = nframes << 1;
-
-		cdst = vram[backbuf];
-		tunptr = tunmap;
-		for(i=0; i<160; i++) {
-			for(j=0; j<240/2; j++) {
-				uint16_t pp;
-
-				tun = *tunptr++;
-				angle = tun & 0xffff;
-				depth = tun >> 16;
-				tx = (angle >> 6) & 0x7f;
-				ty = ((depth >> 7) - zoffs) & 0x7f;
-				pp = tuncross_pixels[(ty << 7) + tx];
-
-				tun = *tunptr++;
-				angle = tun & 0xffff;
-				depth = tun >> 16;
-				tx = (angle >> 6) & 0x7f;
-				ty = ((depth >> 7) - zoffs) & 0x7f;
-				pp |= (uint16_t)tuncross_pixels[(ty << 7) + tx] << 8;
-
-				*cdst++ = pp;
-			}
-		}
+		bnstate = ~REG_KEYINPUT;
+
+		draw_tunnel();
 
-		//while(!(REG_DISPSTAT & DISPSTAT_VBLANK));
-		while(REG_VCOUNT < 160);
-		//REG_DISPCNT ^= DISPCNT_FB1;
+		vblperf_end();
+		wait_vblank();
 		present(backbuf);
+		vblperf_begin();
+	}
+}
+
+__attribute__((noinline, target("arm"), section(".iwram")))
+static void draw_tunnel(void)
+{
+	int i, j, tx, ty, angle, depth, zoffs, uoffs;
+	uint16_t pptop;
+	uint16_t *top;
+	uint16_t tun;
+	int32_t startx, starty;
+	uint16_t *tmap = (uint16_t*)tunmap;
+
+	zoffs = nframes;
+
+	/*
+	if(bnstate & KEY_LT) tunrot++;
+	if(bnstate & KEY_RT) tunrot--;
+	*/
+	tunrot = nframes;
+
+	tunmat[0] = COS(tunrot);
+	tunmat[1] = -SIN(tunrot);
+	tunmat[2] = SIN(tunrot);
+	tunmat[3] = COS(tunrot);
+	tunx = (128 << 8) - tunmat[0] * 120 + tunmat[1] * -80;
+	tuny = (128 << 8) - tunmat[2] * 120 + tunmat[3] * -80;
+
+	uoffs = tunrot;
+
+	top = vram[backbuf];
+	for(i=0; i<160; i++) {
+		startx = tunx;
+		starty = tuny;
+		for(j=0; j<240/2; j++) {
+			tx = (tunx >> 8) & 0xff;
+			ty = (tuny >> 8) & 0xff;
+			tun = tmap[(ty << 8) + tx];
+
+			tunx += tunmat[0];
+			tuny += tunmat[2];
+
+			angle = tun & 0xff;
+			depth = (tun >> 8) & 0xff;
+			tx = ((angle >> 1) - uoffs) & 0x1f;
+			ty = ((depth >> 1) + zoffs) & 0x1f;
+			pptop = tex[(ty << 5) + tx];
+
+			tx = (tunx >> 8) & 0xff;
+			ty = (tuny >> 8) & 0xff;
+			tun = tmap[(ty << 8) + tx];
+
+			tunx += tunmat[0];
+			tuny += tunmat[2];
+
+			angle = tun & 0xff;
+			depth = (tun >> 8) & 0xff;
+			tx = ((angle >> 1) - uoffs) & 0x1f;
+			ty = ((depth >> 1) + zoffs) & 0x1f;
+			pptop |= (uint16_t)tex[(ty << 5) + tx] << 8;
+
+			*top++ = pptop;
+		}
+
+		tunx = startx + tunmat[1];
+		tuny = starty + tunmat[3];
+	}
+}
+
+__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);
+	mat[1] = -SIN(rot);
+	mat[2] = SIN(rot);
+	mat[3] = COS(rot);
+	spr_transform(oam, 0, mat);
+
+
+	dma_copy16(3, (void*)OAM_ADDR, oam, sizeof oam / 2, 0);
 }