From 41b1d4623dd42a6bacd4fec89736022dc620fadd Mon Sep 17 00:00:00 2001 From: hgn Date: Wed, 21 Jul 2021 16:58:14 +0100 Subject: [PATCH] pre-move config validation --- build.sh | 4 +- fishladder.c | 290 +++++++++++++++++++++++++++++++++++++++++++++++---- vg/config.h | 2 +- 3 files changed, 270 insertions(+), 26 deletions(-) diff --git a/build.sh b/build.sh index b131633..bd7ec51 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,8 @@ src="fishladder.c" target="fishladder" lib="-I. -L./lib -L./" -libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl -l:steam/libsteam_api.so" -flags="-fsanitize=address -ggdb3 -Wno-unused-function" +libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl" # -l:steam/libsteam_api.so" +flags="-fsanitize=address -ggdb3 -Wno-unused-function -DNO_STEAM" run_after=false do_build=true diff --git a/fishladder.c b/fishladder.c index 70448bc..a06f075 100644 --- a/fishladder.c +++ b/fishladder.c @@ -45,6 +45,8 @@ int main( int argc, char *argv[] ) #define CELL_FLAG_ITER 0x10 #define CELL_FLAG_CANAL 0x20 #define CELL_FLAG_CONNECTOR 0x40 /* Does this cell split and have an incoming vertical connection? */ +#define CELL_FLAG_WALKABLE (CELL_FLAG_IO|CELL_FLAG_CANAL) +#define CELL_FLAG_VISITED 0x80 static struct { @@ -58,13 +60,24 @@ static struct char *conditions; int level; - int diff[2]; + int state; } * cells; + struct fish + { + int alive; + int co[2]; + int dir[2]; + char data; + } + fishes[ 20 ]; + int num_fishes; + vec3 origin; struct cell *selected; int select_valid; + int playing; u32 frame; u32 *io; @@ -107,6 +120,65 @@ static struct cell *map_tile_at( int pos[2] ) return NULL; } +void map_tile_coords_from_index( int i, int coords[2] ) +{ + coords[0] = i % map.x; + coords[1] = (i - coords[0])/map.x; +} + +static void map_stack_refresh(void) +{ + for( int i = 0; i < map.x*map.y; i ++ ) + map.cells[i].flags &= ~CELL_FLAG_VISITED; +} + +static void map_stack_init( int coords[2] ) +{ + map.stack.level = 0; + map.stack.frames[0].i = 0; + map.stack.frames[0].x = coords[0]; + map.stack.frames[0].y = coords[1]; +} + +static struct cell *map_stack_next(void) +{ + struct cell *tile = NULL; + + while( !tile ) + { + struct vframe *frame = &map.stack.frames[ map.stack.level ]; + + int output_dirs[][2] = { {0,-1}, {-1,0}, {1,0} }; + + if( frame->i < 3 ) + { + int *dir = output_dirs[ frame->i ]; + tile = map_tile_at( (int[2]){frame->x+dir[0], frame->y+dir[1]} ); + frame->i ++; + + if( tile && !(tile->flags & CELL_FLAG_VISITED) ) + { + map.stack.level ++; + frame[1].i = 0; + frame[1].x = frame[0].x+dir[0]; + frame[1].y = frame[0].y+dir[1]; + } + else + tile = NULL; + } + else + { + map.stack.level --; + tile = NULL; + + if( map.stack.level < 0 ) + return NULL; + } + } + + return tile; +} + static int map_load( const char *str ) { map_free(); @@ -230,6 +302,46 @@ static int map_load( const char *str ) return 1; } +static int map_tile_availible( int co[2] ) +{ + // Extract 5x5 grid surrounding tile + u32 blob = 0x1000; + for( int y = vg_max( co[1]-2, 0 ); y < vg_min( map.y, co[1]+3 ); y ++ ) + for( int x = vg_max( co[0]-2, 0 ); x < vg_min( map.x, co[0]+3 ); x ++ ) + { + struct cell *cell = map_tile_at( (int[2]){ x, y } ); + + if( cell && (cell->flags & CELL_FLAG_WALKABLE) ) + blob |= 0x1 << ((y-(co[1]-2))*5 + x-(co[0]-2)); + } + + // Run filter over center 3x3 grid to check for invalid configurations + int kernel[] = { 0, 1, 2, 5, 6, 7, 10, 11, 12 }; + for( int i = 0; i < vg_list_size(kernel); i ++ ) + { + if( blob & (0x1 << (6+kernel[i])) ) + { + // (reference window: 0x1CE7) Illegal moves + // 0100011100010 ; + // 0000001100011 ; + // 0000011000110 ; + // 0110001100000 ; + // 1100011000000 ; + // 0100001100010 ; + // 0100011000010 ; + + u32 invalid[] = { 0x8E2, 0x63, 0xC6, 0xC60, 0x18C0, 0x862, 0x8C2 }; + u32 window = blob >> kernel[i]; + + for( int j = 0; j < vg_list_size(invalid); j ++ ) + if((window & invalid[j]) == invalid[j]) + return 0; + } + } + + return 1; +} + void vg_update(void) { // Update camera @@ -244,7 +356,6 @@ void vg_update(void) glm_mat4_mul( m_projection, m_view, vg_pv ); // Compute map update - map.frame ^= 0x1; for( int y = 0; y < map.y; y ++ ) { for( int x = 0; x < map.x; x ++ ) @@ -297,41 +408,152 @@ void vg_update(void) map.selected = map_tile_at( (int [2]){tile_x, tile_y} ); - if( map.selected ) + if( map.playing ) { - // Check if valid - int validation[][2] = { {1,1}, {-1,1}, {-1,-1}, {1,-1} }; - struct cell *a, *b, *c; + static int fish_counter = 0; + fish_counter ++; - map.select_valid = 1; - for( int i = 0; i < vg_list_size( validation ); i ++ ) + if( fish_counter > 20 ) { - a = map_tile_at( (int [2]){ tile_x+validation[i][0], tile_y } ); - b = map_tile_at( (int [2]){ tile_x, tile_y+validation[i][1] } ); + fish_counter = 0; + + // Advance characters + for( int i = 0; i < map.num_fishes; i ++ ) + { + struct fish *fish = map.fishes + i; + + if( !fish->alive ) + continue; + + struct cell *tile, *next; + tile = map_tile_at( fish->co ); + + if( tile->flags & CELL_FLAG_OUTPUT ) + { + vg_info( "Fish got zucced (%d)\n", i ); + fish->alive = 0; + continue; + } + + int die = 0; + if( tile->flags & CELL_FLAG_CONNECTOR ) + { + die = 1; + int new_dir[][2] = { {0,-1},{1,0},{-1,0} }; + int *test_dir; + + for( int j = 0; j < 3; j ++ ) + { + test_dir = new_dir[ tile->state ]; + tile->state = (tile->state+1)%3; + + next = map_tile_at( (int[2]){ fish->co[0]+test_dir[0], fish->co[1]+test_dir[1] } ); + if( next && (next->flags & (CELL_FLAG_WALKABLE)) ) + { + fish->dir[0] = test_dir[0]; + fish->dir[1] = test_dir[1]; + die = 0; + break; + } + } + } + + next = map_tile_at( (int[2]){ fish->co[0]+fish->dir[0], fish->co[1]+fish->dir[1] } ); + if( !next || (next && !(next->flags & CELL_FLAG_WALKABLE)) ) + { + // Try UP + die = 1; + } + + if( die ) + { + vg_info( "Fish died! (%d)\n", i ); + fish->alive = 0; + continue; + } + + + fish->co[0] += fish->dir[0]; + fish->co[1] += fish->dir[1]; + } - if( a && b && (a->flags & b->flags & CELL_FLAG_CANAL) ) + // Try spawn fish + for( int i = 0; i < arrlen( map.io ); i ++ ) { - c = map_tile_at( (int [2]){ tile_x+validation[i][0], tile_y+validation[i][1] } ); + struct cell *input = &map.cells[ map.io[i] ]; - if( c && (c->flags & CELL_FLAG_CANAL ) ) + if( input->flags & CELL_FLAG_INPUT ) { - map.select_valid = 0; - break; + if( input->state < arrlen( input->conditions ) ) + { + struct fish *fish = &map.fishes[ map.num_fishes ]; + map_tile_coords_from_index( map.io[i], fish->co ); + + int output_dirs[][2] = { {0,-1}, {-1,0}, {1,0} }; + int can_spawn = 0; + + for( int i = 0; i < vg_list_size( output_dirs ); i ++ ) + { + int *dir = output_dirs[i]; + struct cell *next = map_tile_at( (int[2]){ fish->co[0]+dir[0], fish->co[1]+dir[1] } ); + if( next && next->flags & CELL_FLAG_CANAL ) + { + fish->dir[0] = dir[0]; + fish->dir[1] = dir[1]; + can_spawn = 1; + } + } + + if( can_spawn ) + { + fish->alive = 1; + input->state ++; + map.num_fishes ++; + } + } } } + + vg_info( "There are now %u active fish\n", map.num_fishes ); + } + + if( vg_get_button_down( "go" ) ) + { + map.playing = 0; + map.num_fishes = 0; + + vg_info( "Ending!\n" ); + } + } + else + { + if( vg_get_button_down( "go" ) ) + { + map.playing = 1; + + // Reset everything + for( int i = 0; i < map.x*map.y; i ++ ) + map.cells[ i ].state = 0; + + vg_info( "Starting!\n" ); } - if( map.select_valid ) + if( map.selected ) { - if( vg_get_button_down("primary") ) + map.select_valid = map_tile_availible( (int[2]){ tile_x, tile_y } ); + + if( map.select_valid ) { - if( map.selected->flags & CELL_FLAG_CANAL ) + if( vg_get_button_down("primary") ) { - map.selected->flags &= ~(CELL_FLAG_CANAL | CELL_FLAG_CONNECTOR); - } - else - { - map.selected->flags |= CELL_FLAG_CANAL; + if( map.selected->flags & CELL_FLAG_CANAL ) + { + map.selected->flags &= ~(CELL_FLAG_CANAL | CELL_FLAG_CONNECTOR); + } + else + { + map.selected->flags |= CELL_FLAG_CANAL; + } } } } @@ -393,6 +615,28 @@ void vg_render(void) glDrawArrays( GL_TRIANGLES, 0, 6 ); } } + + glUniform4f( SHADER_UNIFORM( colour_shader, "uColour" ), 1.f, 0.f, 1.f, 1.f ); + + for( int i = 0; i < map.num_fishes; i ++ ) + { + struct fish *fish = map.fishes + i; + + if( fish->alive ) + { + glm_mat4_identity( m_mdl ); + glm_translate( m_mdl, + (vec3){ + map.origin[0] + (float)fish->co[0] + 0.5f, + 0.1f, + map.origin[2] + (float)fish->co[1] + 0.5f + } + ); + glm_scale_uni( m_mdl, 0.2f ); + glUniformMatrix4fv( SHADER_UNIFORM( colour_shader, "uMdl" ), 1, GL_FALSE, (float *)m_mdl ); + glDrawArrays( GL_TRIANGLES, 0, 6 ); + } + } } void vg_start(void) diff --git a/vg/config.h b/vg/config.h index d8a9246..a5938f1 100644 --- a/vg/config.h +++ b/vg/config.h @@ -5,7 +5,7 @@ static struct button_binding vg_button_binds[] = { .name = "primary", .bind = GLFW_MOUSE_BUTTON_LEFT }, { .name = "secondary", .bind = GLFW_MOUSE_BUTTON_RIGHT }, { .name = "noclip", .bind = GLFW_KEY_V, }, - { .name = "jump", .bind = GLFW_KEY_SPACE } + { .name = "go", .bind = GLFW_KEY_SPACE } }; static struct axis_binding vg_axis_binds[] = -- 2.25.1