X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgamescr.c;h=df11abc485988f8c32b316371441fb94aa6414f1;hb=c52a5978823a77da3570cb73b985b928bb8358d9;hp=b923a734e028e19679aead6c5cfadb2c539bf57c;hpb=a40ea78e8bd2fc5ba01906fd19bedf074203a24a;p=gbajam22 diff --git a/src/gamescr.c b/src/gamescr.c index b923a73..df11abc 100644 --- a/src/gamescr.c +++ b/src/gamescr.c @@ -6,11 +6,9 @@ #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" @@ -34,6 +32,14 @@ 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; @@ -49,10 +55,25 @@ 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 (256 - 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 inline void xform_pixel(int *xp, int *yp); + + struct screen *init_game_screen(void) { return &gamescr; @@ -60,7 +81,9 @@ struct screen *init_game_screen(void) static int gamescr_start(void) { - int i, sidx; + int i, j, sidx; + uint8_t *cptr; + struct enemy *enemy; gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1); @@ -89,7 +112,7 @@ static int gamescr_start(void) 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(); @@ -109,17 +132,51 @@ static int gamescr_start(void) 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= CMAP_SPAWN0) { + /* enemy spawn point */ + enemy = enemies + *cptr - CMAP_SPAWN0; + if(enemy->anm) { + panic(get_pc(), "double spawn at %d,%d", j, i); + } + enemy->vobj.x = j; + enemy->vobj.y = i; + enemy->vobj.px = -1; + enemy->anm = 0xff; + enemy->hp = 2; + enemy->last_fire = 0; + total_enemies++; + } + cptr++; + } + } + /* check continuity */ + for(i=0; ianm <= 0) { + panic(get_pc(), "discontinuous enemy list"); + } + enemies[i].anm = rand() & 7; + } + + vox_objects(vox, (struct vox_object*)enemies, total_enemies, sizeof *enemies); + nframes = 0; return 0; } static void gamescr_stop(void) { - /*mask(INTR_HBLANK);*/ } static void gamescr_frame(void) @@ -165,7 +222,8 @@ 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(); @@ -190,12 +248,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; } @@ -214,11 +270,12 @@ static void update(void) vox_view(vox, 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; @@ -226,10 +283,55 @@ 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; ivobj.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 { + 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> 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 ARM_IWRAM static void gamescr_vblank(void) { - static int bank, bankdir, theta, s; + static int bank, bankdir, theta; int32_t sa, ca; + vblcount++; + if(!nframes) return; - dma_copy32(3, (void*)(OAM_ADDR + dynspr_base * 8), oam + dynspr_base * 4, dynspr_count * 2, 0); + /* 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, 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); @@ -287,35 +409,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]; -} -*/