X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=abbbce909b22b2ae03813cf4d87e609217ade1f8;hb=9b4d0592a0ced2a5de7d1ced2eca81dd814be33b;hp=0e5c6f833e1c8587ea028bb12c898e13f1e90792;hpb=d6c34b24f0bca93a88b3badb415090e4d3fdb03b;p=gbajam22

diff --git a/src/gamescr.c b/src/gamescr.c
index 0e5c6f8..abbbce9 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -6,14 +6,16 @@
 #include "util.h"
 #include "intr.h"
 #include "input.h"
-#include "player.h"
 #include "gba.h"
 #include "sprite.h"
 #include "debug.h"
-#include "level.h"
 #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,16 +32,24 @@ 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		32
+static uint16_t oam[4 * MAX_SPR];
+static int dynspr_base, dynspr_count;
 
+static int num_tur, total_tur;
+static int energy;
+#define MAX_ENERGY	5
 
 struct screen *init_game_screen(void)
 {
@@ -48,53 +58,74 @@ struct screen *init_game_screen(void)
 
 static int gamescr_start(void)
 {
-	int i;
+	int i, sidx;
 
 	gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
 
 	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, 10, 100);
+	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] = (((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();
+	*/
+
+	spr_setup(16, 16, spr_game_pixels, spr_game_cmap);
+	wait_vblank();
+	spr_clear();
 
-	/* setup sky gradient palette */
-	for(i=0; i<64; i++) {
-		int t = (i << 8) / 64;
-		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] = ((b << 7) & 0x7c00) | ((g << 2) & 0x3e0) | (r >> 3);
+	for(i=0; i<MAX_SPR; i++) {
+		spr_oam_clear(oam, i);
 	}
 
+	sidx = 0;
+	spr_oam(oam, sidx++, SPRID_CROSS, 120-8, 80-8, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, sidx++, SPRID_UIMID, 0, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, sidx++, SPRID_UIRIGHT, 48, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, sidx++, SPRID_UILEFT, 168, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, sidx++, SPRID_UITGT, 184, 144, SPR_SZ16 | SPR_256COL);
+	spr_oam(oam, sidx++, SPRID_UISLASH, 216, 144, SPR_VRECT | SPR_256COL);
+	dynspr_base = sidx;
+
+	wait_vblank();
+	dma_copy32(3, (void*)OAM_ADDR, oam, sidx * 2, 0);
+
+	num_tur = 0;
+	total_tur = 16;
+	energy = 5;
+
 	nframes = 0;
 	return 0;
 }
 
 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();
@@ -102,59 +133,215 @@ 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 NS(x)	(SPRID_UINUM + ((x) << 1))
+static int numspr[][2] = {
+	{NS(0),NS(0)}, {NS(0),NS(1)}, {NS(0),NS(2)}, {NS(0),NS(3)}, {NS(0),NS(4)},
+	{NS(0),NS(5)}, {NS(0),NS(6)}, {NS(0),NS(7)}, {NS(0),NS(8)}, {NS(0),NS(9)},
+	{NS(1),NS(0)}, {NS(1),NS(1)}, {NS(1),NS(2)}, {NS(1),NS(3)}, {NS(1),NS(4)},
+	{NS(1),NS(5)}, {NS(1),NS(6)}, {NS(1),NS(7)}, {NS(1),NS(8)}, {NS(1),NS(9)},
+	{NS(2),NS(0)}, {NS(2),NS(1)}, {NS(2),NS(2)}, {NS(2),NS(3)}, {NS(2),NS(4)},
+	{NS(2),NS(5)}, {NS(2),NS(6)}, {NS(2),NS(7)}, {NS(2),NS(8)}, {NS(2),NS(9)},
+	{NS(3),NS(0)}, {NS(3),NS(1)}, {NS(3),NS(2)}, {NS(3),NS(3)}, {NS(3),NS(4)},
+	{NS(3),NS(5)}, {NS(3),NS(6)}, {NS(3),NS(7)}, {NS(3),NS(8)}, {NS(3),NS(9)}
+};
+
 #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;
+	int i, snum, ledspr;
 
-	if((input = read_input())) {
+	update_keyb();
 
-		if(input & BN_LT) angle += TURN_SPEED;
-		if(input & BN_RT) angle -= TURN_SPEED;
+	if(KEYPRESS(BN_SELECT)) {
+		vox_quality ^= 1;
+	}
+
+	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(input & BN_UP) {
+		if(keystate & BN_A) {
 			pos[0] += fwd[0];
 			pos[1] += fwd[1];
 		}
-		if(input & BN_DOWN) {
+		/*
+		if(keystate & BN_DOWN) {
 			pos[0] -= fwd[0];
 			pos[1] -= fwd[1];
 		}
-		if(input & BN_RIGHT) {
+		*/
+		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(input & BN_LEFT) {
+		if(keystate & BN_LT) {
 			pos[0] -= right[0];
 			pos[1] -= right[1];
 		}
 
-		vox_view(vox, pos[0], pos[1], -30, angle);
+		vox_view(vox, pos[0], pos[1], -40, angle);
+	}
+
+	snum = 0;
+	/* turrets number */
+	spr_oam(oam, dynspr_base + snum++, numspr[num_tur][0], 200, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[num_tur][1], 208, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[total_tur][0], 224, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[total_tur][1], 232, 144, SPR_VRECT | SPR_256COL);
+	/* energy bar */
+	if(energy == MAX_ENERGY) {
+		ledspr = SPRID_LEDBLU;
+	} else {
+		ledspr = energy > 2 ? SPRID_LEDGRN : SPRID_LEDRED;
+	}
+	for(i=0; i<5; i++) {
+		spr_oam(oam, dynspr_base + snum++, i >= energy ? SPRID_LEDOFF : ledspr,
+				8 + (i << 3), 144, SPR_VRECT | SPR_256COL);
 	}
+	/* enemy sprites */
+	spr_oam(oam, dynspr_base + snum++, SPRID_ENEMY, 50, 50, SPR_VRECT | SPR_SZ64 | SPR_256COL);
+
+	mask(INTR_VBLANK);
+	dynspr_count = snum;
+	unmask(INTR_VBLANK);
 }
 
 static void draw(void)
 {
+	//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_solid(vox, COLOR_ZENITH);
+	//vox_sky_solid(vox, COLOR_ZENITH);
 }
 
-#ifdef BUILD_GBA
-__attribute__((noinline, target("arm"), section(".iwram")))
-#endif
+#define OFFS(x, y)	((y) * 128 + (x))
+static short enemy_frame_offs[] = {
+	OFFS(0, 128), OFFS(32, 128), OFFS(64, 128), OFFS(96, 128),
+	OFFS(0, 192), OFFS(32, 192), OFFS(64, 192), OFFS(96, 192)
+};
+
+#define MAXBANK		0x100
+
+ARM_IWRAM
 static void gamescr_vblank(void)
 {
-	num_vbl++;
+	static int bank, bankdir, theta, s;
+	int32_t sa, ca;
+	uint16_t *src, *dst;
+	int i;
+
+	if(!nframes) return;
+
+	/* TODO: pre-arrange sprite tiles in gba-native format, so that I can just
+	 * DMA them from cartridge easily
+	 */
+
+	/*
+	src = (void*)(spr_game_pixels + enemy_frame_offs[1]);
+	dst = (void*)(VRAM_LFB_OBJ_ADDR + SPRID(0, 64));
+	for(i=0; i<64; i++) {
+		dma_copy32(3, dst, src, 32 / 4, 0);
+		dst += 32 / 2;
+		src += 128 / 2;
+	}
+	*/
+
+	dma_copy32(3, (void*)(OAM_ADDR + dynspr_base * 8), oam + dynspr_base * 4, dynspr_count * 2, 0);
+
+	theta = -(bank << 3);
+#if 0
+	s = 0x100000 / (MAXBANK + (abs(bank) >> 3));
+	sa = ((SIN(theta) >> 8) * s) >> 12;
+	ca = ((COS(theta) >> 8) * s) >> 12;
+#else
+	s = (MAXBANK + (abs(bank) >> 3));
+	sa = SIN(theta) / s;
+	ca = COS(theta) / s;
+#endif
+
+	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];
 }
+*/