porting voxscape to gba

[gbajam22] / src / gamescr.c

diff --git a/src/gamescr.c b/src/gamescr.c
index 7981cb4..3adb5c8 100644 (file)
--- a/src/gamescr.c
+++ b/src/gamescr.c
@@ -11,6 +11,8 @@
 #include "sprite.h"
 #include "debug.h"
 #include "level.h"
+#include "voxscape.h"
+#include "data.h"
 
 static int gamescr_start(void);
 static void gamescr_stop(void);
@@ -34,8 +36,8 @@ static uint16_t *vram[] = { gba_vram_lfb0, gba_vram_lfb1 };
 static int32_t pos[2], angle;
 static struct voxscape *vox;
 
-#define COLOR_HORIZON  0xcc77ff
-#define COLOR_ZENITH   0x5588cc
+#define COLOR_HORIZON  192
+#define COLOR_ZENITH   255
 
 
 
@@ -46,15 +48,37 @@ struct screen *init_game_screen(void)
 
 static int gamescr_start(void)
 {
+       int i;
+
        gba_setmode(4, DISPCNT_BG2 | DISPCNT_OBJ | DISPCNT_FB1);
 
        vblperf_setcolor(1);
 
-       if(!(vox = vox_create(512, 512))) {
+       pos[0] = pos[1] = 256 << 16;
+
+       if(!(vox = vox_create(512, 512, height_pixels, color_pixels))) {
                panic(get_pc(), "vox_create");
        }
        vox_proj(vox, 45, 1, 250);
 
+       /* setup color image palette */
+       for(i=0; i<192; 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);
+       }
+
+       /* 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);
+       }
+
        /*select_input(BN_DPAD | BN_LT | BN_RT);*/
 
        nframes = 0;
@@ -91,7 +115,7 @@ static void update(void)
        int32_t fwd[2], right[2];
        uint16_t input;
 
-       input = ~REG_KEYINPUT;
+       input = read_input();
 
        if(input & BN_LT) angle += TURN_SPEED;
        if(input & BN_RT) angle -= TURN_SPEED;
@@ -123,8 +147,10 @@ static void update(void)
 
 static void draw(void)
 {
+//     vox_begin(vox);
        vox_render(vox);
        vox_sky_grad(vox, COLOR_HORIZON, COLOR_ZENITH);
+       //vox_sky_solid(vox, COLOR_ZENITH);
 }
 
 #ifdef BUILD_GBA