X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgamescr.c;h=cc089f22a8f0326272de7b0c67f56657b61b4287;hb=53c0ee3332822465be7dcf923ca3c6445076b555;hp=c422119bb7ae34ef77ee2bbdbd4b7b800da96594;hpb=bf04799fd08b2f45c3f912911ffaf96feccfb511;p=gbajam22

diff --git a/src/gamescr.c b/src/gamescr.c
index c422119..cc089f2 100644
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -32,13 +32,20 @@ static struct screen gamescr = {
 	gamescr_vblank
 };
 
+struct enemy {
+	struct vox_object vobj;
+	short hp;
+	short anm;
+	int last_fire;
+};
+#define ENEMY_VALID(e)	((e)->anm != 0)
+
 static uint16_t *framebuf;
 
 static int nframes, backbuf;
 static uint16_t *vram[] = { gba_vram_lfb0, gba_vram_lfb1 };
 
 static int32_t pos[2], angle, horizon = 80;
-static struct voxscape *vox;
 
 #define COLOR_HORIZON	192
 #define COLOR_ZENITH	255
@@ -47,10 +54,26 @@ static struct voxscape *vox;
 static uint16_t oam[4 * MAX_SPR];
 static int dynspr_base, dynspr_count;
 
-static int num_tur, total_tur;
+
+#define MAX_ENEMIES		(255 - CMAP_SPAWN0)
+struct enemy enemies[MAX_ENEMIES];
+int num_enemies, total_enemies;
 static int energy;
 #define MAX_ENERGY	5
 
+
+#define XFORM_PIXEL_X(x, y)	(xform_ca * (x) - xform_sa * (y) + (120 << 8))
+#define XFORM_PIXEL_Y(x, y)	(xform_sa * (x) + xform_ca * (y) + (80 << 8))
+static int32_t xform_sa, xform_ca;	/* for viewport bank/zoom */
+static int xform_s;
+
+static short vblcount;
+static void *prev_iwram_top;
+
+
+static inline void xform_pixel(int *xp, int *yp);
+
+
 struct screen *init_game_screen(void)
 {
 	return &gamescr;
@@ -58,7 +81,11 @@ struct screen *init_game_screen(void)
 
 static int gamescr_start(void)
 {
-	int i, sidx;
+	int i, j, sidx;
+	uint8_t *cptr;
+	struct enemy *enemy;
+
+	prev_iwram_top = iwram_sbrk(0);
 
 	gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
 
@@ -66,11 +93,9 @@ static int gamescr_start(void)
 
 	pos[0] = pos[1] = VOX_SZ << 15;
 
-	if(!(vox = vox_create(VOX_SZ, VOX_SZ, height_pixels, color_pixels))) {
-		panic(get_pc(), "vox_create");
-	}
-	vox_proj(vox, FOV, NEAR, FAR);
-	vox_view(vox, pos[0], pos[1], -40, angle);
+	vox_init(VOX_SZ, VOX_SZ, height_pixels, color_pixels);
+	vox_proj(FOV, NEAR, FAR);
+	vox_view(pos[0], pos[1], -40, angle);
 
 	/* setup color image palette */
 	for(i=0; i<256; i++) {
@@ -79,15 +104,8 @@ static int gamescr_start(void)
 		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, 8, spr_game_pixels, spr_game_cmap);
+
+	spr_setup(16, 16, spr_game_pixels, spr_game_cmap);
 	wait_vblank();
 	spr_clear();
 
@@ -104,20 +122,57 @@ static int gamescr_start(void)
 	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;
+	num_enemies = total_enemies = 0;
 	energy = 5;
 
+	srand(0);
+	cptr = color_pixels;
+	for(i=0; i<VOX_SZ; i++) {
+		for(j=0; j<VOX_SZ; j++) {
+			if(*cptr == 255) {
+				/* player spawn point */
+				pos[0] = j << 16;
+				pos[1] = i << 16;
+
+			} else if(*cptr >= CMAP_SPAWN0 && *cptr != 255) {
+				/* enemy spawn point */
+				int idx = *cptr - CMAP_SPAWN0;
+				enemy = enemies + idx;
+				if(enemy->anm) {
+					panic(get_pc(), "double spawn %d at %d,%d (prev: %d,%d)", idx,
+							j, i, enemy->vobj.x, enemy->vobj.y);
+				}
+				enemy->vobj.x = j;
+				enemy->vobj.y = i;
+				enemy->vobj.px = -1;
+				enemy->anm = 0xff;
+				enemy->hp = 2;
+				enemy->last_fire = 0;
+				if(++total_enemies >= MAX_ENEMIES) {
+					goto endspawn;
+				}
+			}
+			cptr++;
+		}
+	}
+endspawn:
+	/* check continuity */
+	for(i=0; i<total_enemies; i++) {
+		if(enemies[i].anm <= 0) {
+			panic(get_pc(), "discontinuous enemy list");
+		}
+		enemies[i].anm = rand() & 7;
+	}
+
+	vox_objects((struct vox_object*)enemies, total_enemies, sizeof *enemies);
+
 	nframes = 0;
 	return 0;
 }
 
 static void gamescr_stop(void)
 {
-	/*mask(INTR_HBLANK);*/
+	iwram_brk(prev_iwram_top);
 }
 
 static void gamescr_frame(void)
@@ -125,7 +180,7 @@ static void gamescr_frame(void)
 	backbuf = ++nframes & 1;
 	framebuf = vram[backbuf];
 
-	vox_framebuf(vox, 240, 160, framebuf, horizon);
+	vox_framebuf(240, 160, framebuf, horizon);
 
 	update();
 	draw();
@@ -163,12 +218,14 @@ static int numspr[][2] = {
 static void update(void)
 {
 	int32_t fwd[2], right[2];
-	int i, ledspr;
+	int i, snum, ledspr;
+	struct enemy *enemy;
 
 	update_keyb();
 
-	if(KEYPRESS(BN_SELECT)) {
-		vox_quality ^= 1;
+	if(KEYPRESS(BN_START)) {
+		/* TODO pause menu */
+		change_screen(find_screen("menu"));
 	}
 
 	if(keystate) {
@@ -188,12 +245,10 @@ static void update(void)
 			pos[0] += fwd[0];
 			pos[1] += fwd[1];
 		}
-		/*
-		if(keystate & BN_DOWN) {
+		if(keystate & BN_B) {
 			pos[0] -= fwd[0];
 			pos[1] -= fwd[1];
 		}
-		*/
 		if(keystate & BN_UP) {
 			if(horizon > 40) horizon -= ELEV_SPEED;
 		}
@@ -209,14 +264,15 @@ static void update(void)
 			pos[1] -= right[1];
 		}
 
-		vox_view(vox, pos[0], pos[1], -40, angle);
+		vox_view(pos[0], pos[1], -40, angle);
 	}
 
+	snum = 0;
 	/* turrets number */
-	spr_oam(oam, dynspr_base, numspr[num_tur][0], 200, 144, SPR_VRECT | SPR_256COL);
-	spr_oam(oam, dynspr_base + 1, numspr[num_tur][1], 208, 144, SPR_VRECT | SPR_256COL);
-	spr_oam(oam, dynspr_base + 2, numspr[total_tur][0], 224, 144, SPR_VRECT | SPR_256COL);
-	spr_oam(oam, dynspr_base + 3, numspr[total_tur][1], 232, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[num_enemies][0], 200, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[num_enemies][1], 208, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[total_enemies][0], 224, 144, SPR_VRECT | SPR_256COL);
+	spr_oam(oam, dynspr_base + snum++, numspr[total_enemies][1], 232, 144, SPR_VRECT | SPR_256COL);
 	/* energy bar */
 	if(energy == MAX_ENERGY) {
 		ledspr = SPRID_LEDBLU;
@@ -224,10 +280,56 @@ static void update(void)
 		ledspr = energy > 2 ? SPRID_LEDGRN : SPRID_LEDRED;
 	}
 	for(i=0; i<5; i++) {
-		spr_oam(oam, dynspr_base + i + 4, i >= energy ? SPRID_LEDOFF : ledspr,
+		spr_oam(oam, dynspr_base + snum++, i >= energy ? SPRID_LEDOFF : ledspr,
 				8 + (i << 3), 144, SPR_VRECT | SPR_256COL);
 	}
-	dynspr_count = 9;
+	/* enemy sprites */
+	/*spr_oam(oam, dynspr_base + snum++, SPRID_ENEMY, 50, 50, SPR_VRECT | SPR_SZ64 | SPR_256COL);*/
+	enemy = enemies;
+	for(i=0; i<total_enemies; i++) {
+		int sid, anm, px, py;
+		unsigned int flags;
+		int16_t mat[4];
+		int32_t sa, ca, scale;
+
+		if(enemy->vobj.px >= 0) {
+			flags = SPR_SZ32 | SPR_DBLSZ | SPR_256COL | SPR_ROTSCL | SPR_ROTSCL_SEL(0);
+			if(enemies->hp > 0) {
+				anm = (enemies->anm + (vblcount >> 3)) & 0xf;
+				sid = SPRID_ENEMY0 + ((anm & 7) << 2);
+				flags |= SPR_VRECT;
+			} else {
+				anm = 0;
+				sid = SPRID_HUSK;
+			}
+
+			px = enemy->vobj.px - 120;
+			py = enemy->vobj.py - 80;
+			xform_pixel(&px, &py);
+
+			spr_oam(oam, dynspr_base + snum++, sid, px - 20, py - 32, flags);
+
+			scale = enemy->vobj.scale;
+			if(scale > 0x10000) scale = 0x10000;
+			sa = xform_sa / scale;
+			ca = xform_ca / scale;
+			mat[0] = anm >= 8 ? -ca : ca;
+			mat[1] = sa;
+			mat[2] = -sa;
+			mat[3] = ca;
+
+			spr_transform(oam, 0, mat);
+			enemy->vobj.px = -1;
+		}
+		enemy++;
+	}
+	for(i=snum; i<dynspr_count; i++) {
+		spr_oam_clear(oam, dynspr_base + i);
+	}
+
+	mask(INTR_VBLANK);
+	dynspr_count = snum;
+	unmask(INTR_VBLANK);
 }
 
 static void draw(void)
@@ -235,9 +337,20 @@ 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_render();
+	//vox_sky_grad(COLOR_HORIZON, COLOR_ZENITH);
+	//vox_sky_solid(COLOR_ZENITH);
+}
+
+static inline void xform_pixel(int *xp, int *yp)
+{
+	int32_t sa = xform_sa >> 8;
+	int32_t ca = xform_ca >> 8;
+	int x = *xp;
+	int y = *yp;
+
+	*xp = (ca * x - sa * y + (120 << 8)) >> 8;
+	*yp = (sa * x + ca * y + (80 << 8)) >> 8;
 }
 
 #define MAXBANK		0x100
@@ -245,22 +358,29 @@ static void draw(void)
 ARM_IWRAM
 static void gamescr_vblank(void)
 {
-	static int bank, bankdir, theta, s;
+	static int bank, bankdir, theta;
 	int32_t sa, ca;
 
-	if(!nframes) return;
+	vblcount++;
+
+	/* TODO: pre-arrange sprite tiles in gba-native format, so that I can just
+	 * DMA them from cartridge easily
+	 */
 
-	dma_copy32(3, (void*)(OAM_ADDR + dynspr_base * 8), oam + dynspr_base * 4, dynspr_count * 2, 0);
+	/*dma_copy32(3, (void*)(OAM_ADDR + dynspr_base * 8), oam + dynspr_base * 4, MAX_SPR * 2, 0);*/
+	dma_copy32(3, (void*)OAM_ADDR, oam, MAX_SPR * 2, 0);
 
 	theta = -(bank << 3);
+	xform_sa = SIN(theta);
+	xform_ca = COS(theta);
 #if 0
-	s = 0x100000 / (MAXBANK + (abs(bank) >> 3));
-	sa = ((SIN(theta) >> 8) * s) >> 12;
-	ca = ((COS(theta) >> 8) * s) >> 12;
+	xform_s = 0x100000 / (MAXBANK + (abs(bank) >> 3));
+	sa = (((xform_sa) >> 8) * xform_s) >> 12;
+	ca = (((xform_ca) >> 8) * xform_s) >> 12;
 #else
-	s = (MAXBANK + (abs(bank) >> 3));
-	sa = SIN(theta) / s;
-	ca = COS(theta) / s;
+	xform_s = (MAXBANK + (abs(bank) >> 3));
+	sa = xform_sa / xform_s;
+	ca = xform_ca / xform_s;
 #endif
 
 	REG_BG2X = -ca * 120 - sa * 80 + (120 << 8);
@@ -271,8 +391,6 @@ static void gamescr_vblank(void)
 	REG_BG2PC = -sa;
 	REG_BG2PD = ca;
 
-	keystate = ~REG_KEYINPUT;
-
 	if((keystate & (BN_LEFT | BN_RIGHT)) == 0) {
 		if(bank) {
 			bank -= bankdir << 4;
@@ -285,35 +403,3 @@ static void gamescr_vblank(void)
 		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];
-}
-*/