diff options
Diffstat (limited to 'src/all.c')
| -rw-r--r-- | src/all.c | 103 |
1 files changed, 81 insertions, 22 deletions
@@ -1,13 +1,6 @@ #include <stddef.h> #include <stdint.h> -#if SDL -#include <string.h> -#define xmemcpy memcpy -#else -#define xmemcpy __builtin_memcpy -#endif - #define MEM_SIZE (1<<24) #define GRIDWIDTH 16 #define GRIDHEIGHT 16 @@ -36,6 +29,12 @@ typedef struct { #define new(a, c, t) ((t *) alloc(a, c, sizeof(t), _Alignof(t))) #define affirm(c) while (!(c)) *(volatile int *)0 = 0 +static void xmemcpy(void *dst, void *src, ptrdiff_t size) { + for (ptrdiff_t i = 0; i < size; i++) { + ((char *) dst)[i] = ((char *) src)[i]; + } +} + static void *alloc(Arena *a, ptrdiff_t count, ptrdiff_t size, ptrdiff_t align) { ptrdiff_t pad = -(size_t) a->start & (align - 1); affirm(count < (a->end - a->start - pad) / size); @@ -77,6 +76,8 @@ enum { BLACK, RED, YELLOW, + RED_UP, + RED_DOWN, RED_LEFT, RED_RIGHT, N_COLORS, @@ -109,6 +110,18 @@ static const Color colors[N_COLORS][4] = { }, { {255, 0, 0, 255}, + {255, 0, 0, 255}, + {0, 0, 0, 255}, + {0, 0, 0, 255}, + }, + { + {0, 0, 0, 255}, + {0, 0, 0, 255}, + {255, 0, 0, 255}, + {255, 0, 0, 255}, + }, + { + {255, 0, 0, 255}, {0, 0, 0, 255}, {255, 0, 0, 255}, {0, 0, 0, 255}, @@ -180,23 +193,49 @@ static void update(Game *game, uint64_t now, Arena a) { for (int x = 0; x < GRIDWIDTH; x++) { for (int y = 0; y < GRIDHEIGHT; y++) { switch (lastState->grid[x + y * GRIDWIDTH]) { + int reds, red; case BLACK: + reds = 0; if ( - x < GRIDWIDTH - 1 && - lastState->grid[x + 1 + y * GRIDWIDTH] == RED_LEFT + x < GRIDWIDTH - 1 && ( + lastState->grid[x + 1 + y * GRIDWIDTH] == RED_LEFT || + lastState->grid[x + 1 + y * GRIDWIDTH] == RED + ) ) { - game->state.grid[x + y * GRIDWIDTH] = RED_LEFT; - } else if ( - x > 0 && - lastState->grid[x - 1 + y * GRIDWIDTH] == RED_RIGHT + reds++; + red = lastState->grid[x + 1 + y * GRIDWIDTH]; + } + if ( + x > 0 && ( + lastState->grid[x - 1 + y * GRIDWIDTH] == RED_RIGHT || + lastState->grid[x - 1 + y * GRIDWIDTH] == RED + ) ) { - game->state.grid[x + y * GRIDWIDTH] = RED_RIGHT; - } else if ( - (x > 0 && lastState->grid[x - 1 + y * GRIDWIDTH] == RED) || - (x < GRIDWIDTH - 1 && lastState->grid[x + 1 + y * GRIDWIDTH] == RED) || - (y > 0 && lastState->grid[x + (y - 1) * GRIDWIDTH] == RED) || - (y < GRIDHEIGHT - 1 && lastState->grid[x + (y + 1) * GRIDWIDTH] == RED) + reds++; + red = lastState->grid[x - 1 + y * GRIDWIDTH]; + } + if ( + y > 0 && ( + lastState->grid[x + (y - 1) * GRIDWIDTH] == RED_DOWN || + lastState->grid[x + (y - 1) * GRIDWIDTH] == RED + ) + ) { + reds++; + red = lastState->grid[x + (y - 1) * GRIDWIDTH]; + } + if ( + y < GRIDHEIGHT - 1 && ( + lastState->grid[x + (y + 1) * GRIDWIDTH] == RED_UP || + lastState->grid[x + (y + 1) * GRIDWIDTH] == RED + ) ) { + reds++; + red = lastState->grid[x + (y + 1) * GRIDWIDTH]; + } + + if (reds == 1) { + game->state.grid[x + y * GRIDWIDTH] = red; + } else if (reds >= 2) { game->state.grid[x + y * GRIDWIDTH] = RED; } break; @@ -210,7 +249,7 @@ static void update(Game *game, uint64_t now, Arena a) { ) { game->state.grid[x + y * GRIDWIDTH] = YELLOW; } else { - game->state.grid[x + y * GRIDWIDTH] = RED_RIGHT; + game->state.grid[x + y * GRIDWIDTH] = RED_UP; } break; case RED_RIGHT: @@ -220,6 +259,26 @@ static void update(Game *game, uint64_t now, Arena a) { ) { game->state.grid[x + y * GRIDWIDTH] = YELLOW; } else { + game->state.grid[x + y * GRIDWIDTH] = RED_DOWN; + } + break; + case RED_UP: + if ( + y > 0 && + lastState->grid[x + (y - 1) * GRIDWIDTH] == BLACK + ) { + game->state.grid[x + y * GRIDWIDTH] = YELLOW; + } else { + game->state.grid[x + y * GRIDWIDTH] = RED_RIGHT; + } + break; + case RED_DOWN: + if ( + y < GRIDHEIGHT - 1 && + lastState->grid[x + (y + 1) * GRIDWIDTH] == BLACK + ) { + game->state.grid[x + y * GRIDWIDTH] = YELLOW; + } else { game->state.grid[x + y * GRIDWIDTH] = RED_LEFT; } break; @@ -357,11 +416,11 @@ DrawList *game_render(int width, int height) { } __attribute((export_name("game_update"))) -void game_update(int input, int mousex, int mousey) { +void game_update(int input, int mousex, int mousey, int now) { game->input = input; game->mousex = mousex; game->mousey = mousey; - update(game, perm); + update(game, now, perm); } #endif |