X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=a6ae3fa6215099c2eafa22a098652bb9485e9111;hb=7aad8db2edab014c0f750de76bc24bdab63aef2a;hp=3adb5c8a43bc79b89cfad8b2b5791d704fc53d10;hpb=a4b392b15da0d7da367b1121ec5949f26e10628a;p=gbajam22

diff --git a/src/gamescr.c b/src/gamescr.c
index 3adb5c8..a6ae3fa 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -14,6 +14,10 @@
 #include "voxscape.h"
 #include "data.h"
 
+#define FOV		30
+#define NEAR	2
+#define FAR		85
+
 static int gamescr_start(void);
 static void gamescr_stop(void);
 static void gamescr_frame(void);
@@ -30,15 +34,19 @@ static struct screen gamescr = {
 	gamescr_vblank
 };
 
-static int nframes, num_vbl, backbuf;
+static uint16_t *framebuf;
+
+static int nframes, backbuf;
 static uint16_t *vram[] = { gba_vram_lfb0, gba_vram_lfb1 };
 
-static int32_t pos[2], angle;
+static int32_t pos[2], angle, horizon = 80;
 static struct voxscape *vox;
 
 #define COLOR_HORIZON	192
 #define COLOR_ZENITH	255
 
+#define MAX_SPR		8
+static uint16_t oam[4 * MAX_SPR];
 
 
 struct screen *init_game_screen(void)
@@ -52,34 +60,45 @@ static int gamescr_start(void)
 
 	gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
 
-	vblperf_setcolor(1);
+	vblperf_setcolor(0);
 
-	pos[0] = pos[1] = 256 << 16;
+	pos[0] = pos[1] = VOX_SZ << 15;
 
-	if(!(vox = vox_create(512, 512, height_pixels, color_pixels))) {
+	if(!(vox = vox_create(VOX_SZ, VOX_SZ, height_pixels, color_pixels))) {
 		panic(get_pc(), "vox_create");
 	}
-	vox_proj(vox, 45, 1, 250);
+	vox_proj(vox, FOV, NEAR, FAR);
+	vox_view(vox, pos[0], pos[1], -40, angle);
 
 	/* setup color image palette */
-	for(i=0; i<192; i++) {
+	for(i=0; i<256; i++) {
 		int r = color_cmap[i * 3];
 		int g = color_cmap[i * 3 + 1];
 		int b = color_cmap[i * 3 + 2];
-		gba_bgpal[i] = ((r << 8) & 0x7c00) | ((g << 2) & 0x3e0) | (b >> 3);
+		gba_bgpal[i] = (((uint16_t)b << 7) & 0x7c00) | (((uint16_t)g << 2) & 0x3e0) | (((uint16_t)r >> 3) & 0x1f);
 	}
+	/*
+	intr_disable();
+	interrupt(INTR_HBLANK, hblank);
+	REG_DISPSTAT |= DISPSTAT_IEN_HBLANK;
+	unmask(INTR_HBLANK);
+	intr_enable();
+	*/
 
-	/* setup sky gradient palette */
-	for(i=0; i<64; i++) {
-		int t = i << 8;
-		int r = (0xcc00 + (0x55 - 0xcc) * t) >> 8;
-		int g = (0x7700 + (0x88 - 0x77) * t) >> 8;
-		int b = (0xff00 + (0xcc - 0xff) * t) >> 8;
-		int cidx = COLOR_HORIZON + i;
-		gba_bgpal[cidx] = ((r << 8) & 0x7c00) | ((g << 2) & 0x3e0) | (b >> 3);
-	}
+	spr_setup(16, 2, spr_game_pixels, spr_game_cmap);
 
-	/*select_input(BN_DPAD | BN_LT | BN_RT);*/
+	wait_vblank();
+	spr_clear();
+	spr_oam(oam, 0, 516, 0, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 1, 516, 16, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 2, 516, 32, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 3, 520, 48, 144, SPR_SZ16 | SPR_256COL);
+
+	spr_oam(oam, 4, 512, 176, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 5, 516, 192, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 6, 516, 208, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, 7, 516, 224, 144, SPR_SZ16 | SPR_256COL);
+	dma_copy16(3, (void*)OAM_ADDR, oam, sizeof oam / 2, 0);
 
 	nframes = 0;
 	return 0;
@@ -87,16 +106,15 @@ static int gamescr_start(void)
 
 static void gamescr_stop(void)
 {
+	/*mask(INTR_HBLANK);*/
 }
 
 static void gamescr_frame(void)
 {
-	unsigned char *fb;
-
 	backbuf = ++nframes & 1;
-	fb = (unsigned char*)vram[backbuf];
+	framebuf = vram[backbuf];
 
-	vox_framebuf(vox, 240, 160, fb, -1);
+	vox_framebuf(vox, 240, 160, framebuf, horizon);
 
 	update();
 	draw();
@@ -104,59 +122,147 @@ static void gamescr_frame(void)
 	vblperf_end();
 	wait_vblank();
 	present(backbuf);
+
+	if(!(nframes & 15)) {
+		emuprint("vbl: %d", vblperf_count);
+	}
+#ifdef VBLBAR
 	vblperf_begin();
+#else
+	vblperf_count = 0;
+#endif
 }
 
 #define WALK_SPEED	0x40000
-#define TURN_SPEED	0x100
+#define TURN_SPEED	0x200
+#define ELEV_SPEED	8
 
 static void update(void)
 {
 	int32_t fwd[2], right[2];
-	uint16_t input;
-
-	input = read_input();
 
-	if(input & BN_LT) angle += TURN_SPEED;
-	if(input & BN_RT) angle -= TURN_SPEED;
+	update_keyb();
 
-	fwd[0] = -SIN(angle);
-	fwd[1] = COS(angle);
-	right[0] = fwd[1];
-	right[1] = -fwd[0];
-
-	if(input & BN_UP) {
-		pos[0] += fwd[0];
-		pos[1] += fwd[1];
-	}
-	if(input & BN_DOWN) {
-		pos[0] -= fwd[0];
-		pos[1] -= fwd[1];
-	}
-	if(input & BN_RIGHT) {
-		pos[0] += right[0];
-		pos[1] += right[1];
-	}
-	if(input & BN_LEFT) {
-		pos[0] -= right[0];
-		pos[1] -= right[1];
+	if(KEYPRESS(BN_SELECT)) {
+		vox_quality ^= 1;
 	}
 
-	vox_view(vox, pos[0], pos[1], -30, angle);
+	if(keystate) {
+		if(keystate & BN_LEFT) {
+			angle += TURN_SPEED;
+		}
+		if(keystate & BN_RIGHT) {
+			angle -= TURN_SPEED;
+		}
+
+		fwd[0] = -SIN(angle);
+		fwd[1] = COS(angle);
+		right[0] = fwd[1];
+		right[1] = -fwd[0];
+
+		if(keystate & BN_A) {
+			pos[0] += fwd[0];
+			pos[1] += fwd[1];
+		}
+		/*
+		if(keystate & BN_DOWN) {
+			pos[0] -= fwd[0];
+			pos[1] -= fwd[1];
+		}
+		*/
+		if(keystate & BN_UP) {
+			if(horizon > 40) horizon -= ELEV_SPEED;
+		}
+		if(keystate & BN_DOWN) {
+			if(horizon < 200 - ELEV_SPEED) horizon += ELEV_SPEED;
+		}
+		if(keystate & BN_RT) {
+			pos[0] += right[0];
+			pos[1] += right[1];
+		}
+		if(keystate & BN_LT) {
+			pos[0] -= right[0];
+			pos[1] -= right[1];
+		}
+
+		vox_view(vox, pos[0], pos[1], -40, angle);
+	}
 }
 
 static void draw(void)
 {
-//	vox_begin(vox);
+	dma_fill16(3, framebuf, 0, 240 * 160 / 2);
+	//fillblock_16byte(framebuf, 0, 240 * 160 / 16);
+
 	vox_render(vox);
-	vox_sky_grad(vox, COLOR_HORIZON, COLOR_ZENITH);
+	//vox_sky_grad(vox, COLOR_HORIZON, COLOR_ZENITH);
 	//vox_sky_solid(vox, COLOR_ZENITH);
 }
 
-#ifdef BUILD_GBA
-__attribute__((noinline, target("arm"), section(".iwram")))
-#endif
+#define MAXBANK		0x100
+
+ARM_IWRAM
 static void gamescr_vblank(void)
 {
-	num_vbl++;
+	static int bank, bankdir, theta, scale;
+	int32_t sa, ca;
+
+	theta = -(bank << 3);
+	scale = MAXBANK + (abs(bank) >> 3);
+	sa = SIN(theta) / scale;
+	ca = COS(theta) / scale;
+
+	REG_BG2X = -ca * 120 - sa * 80 + (120 << 8);
+	REG_BG2Y = sa * 120 - ca * 80 + (80 << 8);
+
+	REG_BG2PA = ca;
+	REG_BG2PB = sa;
+	REG_BG2PC = -sa;
+	REG_BG2PD = ca;
+
+	keystate = ~REG_KEYINPUT;
+
+	if((keystate & (BN_LEFT | BN_RIGHT)) == 0) {
+		if(bank) {
+			bank -= bankdir << 4;
+		}
+	} else if(keystate & BN_LEFT) {
+		bankdir = -1;
+		if(bank > -MAXBANK) bank -= 16;
+	} else if(keystate & BN_RIGHT) {
+		bankdir = 1;
+		if(bank < MAXBANK) bank += 16;
+	}
+}
+
+/*
+static uint16_t skygrad[] __attribute__((section(".data"))) = {
+
+	0x662a, 0x660a, 0x660a, 0x660b, 0x660b, 0x660b, 0x660b, 0x6a0b, 0x6a0c,
+	0x6a0c, 0x6a0c, 0x6a0c, 0x6a0c, 0x6a0d, 0x6a0d, 0x6a0d, 0x6a0d, 0x6a0d,
+	0x6a0d, 0x6a0e, 0x6e0e, 0x6e0e, 0x6e0e, 0x6e0e, 0x6e0f, 0x6e0f, 0x6e0f,
+	0x6e0f, 0x6e0f, 0x6e0f, 0x6e10, 0x6e10, 0x7210, 0x7210, 0x7210, 0x7211,
+	0x7211, 0x7211, 0x71f1, 0x71f1, 0x71f2, 0x71f2, 0x71f2, 0x71f2, 0x71f2,
+	0x75f2, 0x75f3, 0x75f3, 0x75f3, 0x75f3, 0x75f3, 0x75f4, 0x75f4, 0x75f4,
+	0x75f4, 0x75f4, 0x75f5, 0x79f5, 0x79f5, 0x79f5, 0x79f5, 0x79f5, 0x79f6,
+	0x79f6, 0x79f6, 0x79f6, 0x79f6, 0x79f7, 0x79f7, 0x79f7, 0x7df7, 0x7df7,
+	0x7df7, 0x7df8, 0x7df8, 0x7df8, 0x7dd8, 0x7dd8, 0x7dd9, 0x7dd9,
+
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9,
+	0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9, 0x7dd9
+};
+
+ARM_IWRAM
+static void hblank(void)
+{
+	int vcount = REG_VCOUNT;
+	gba_bgpal[255] = skygrad[vcount];
 }
+*/