X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=b19f58523b2161207c4d370156aaeb9e35e82ddf;hb=a2178646b6e5b873b8f34e98722ae92e04d84589;hp=2cd35291dafe2532d49037732b0353927e743be3;hpb=8c0c078d020902e7a30a9cc01ab62e6bef80294a;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 2cd3529..b19f585 100644 --- a/fishladder.c +++ b/fishladder.c @@ -31,19 +31,169 @@ m3x3f m_projection; m3x3f m_view; m3x3f m_mdl; +#define FLAG_INPUT 0x1 +#define FLAG_OUTPUT 0x2 +#define FLAG_CANAL 0x4 +#define FLAG_WALL 0x8 + struct world { struct cell { u32 state; - } + u8 water; + } *data; + struct cell_terminal + { + char *conditions; + int id; + } + *io; + u32 w, h; GLuint tile_vao; GLuint tile_vbo; -} world = { .w = 1, .h = 1 }; + + int selected; +} world = {}; + +static void map_free(void) +{ + for( int i = 0; i < arrlen( world.io ); i ++ ) + arrfree( world.io[ i ].conditions ); + + arrfree( world.data ); + arrfree( world.io ); + + world.w = 0; + world.h = 0; + world.data = NULL; + world.io = NULL; +} + +static int map_load( const char *str ) +{ + map_free(); + + char const *c = str; + + // Scan for width + for(;; world.w ++) + { + if( str[world.w] == ';' ) + break; + else if( !str[world.w] ) + { + vg_error( "Unexpected EOF when parsing level\n" ); + return 0; + } + } + + struct cell *row = arraddnptr( world.data, world.w ); + int cx = 0; + int reg_start = 0, reg_end = 0; + + for(;;) + { + if( !*c ) + break; + + if( *c == ';' ) + { + c ++; + + // Parse attribs + if( *c != '\n' ) + { + while( *c ) + { + if( reg_start < reg_end ) + { + if( *c >= 'a' && *c <= 'z' ) + { + arrpush( world.io[ reg_start ].conditions, *c ); + } + else + { + if( *c == ',' || *c == '\n' ) + { + reg_start ++; + + if( *c == '\n' ) + break; + } + else + { + vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h ); + return 0; + } + } + } + else + { + vg_error( "Too many values to assign (row: %u)\n", world.h ); + return 0; + } + + c ++; + } + } + + if( reg_start != reg_end ) + { + vg_error( "Not enough values assigned (row: %u, %u of %u)\n", world.h, reg_start, reg_end ); + return 0; + } + + if( cx != world.w ) + { + vg_error( "Not enough cells to match previous row definition (row: %u, %u<%u)\n", world.h, cx, world.w ); + return 0; + } + + row = arraddnptr( world.data, world.w ); + cx = 0; + world.h ++; + reg_end = reg_start = arrlen( world.io ); + } + else + { + if( cx == world.w ) + { + vg_error( "Too many cells to match previous row definition (row: %u, %u>%u)\n", world.h, cx, world.w ); + return 0; + } + + // Tile initialization + // row[ cx ] .. etc + row[ cx ].water = 0; + + if( *c == '+' || *c == '-' ) + { + struct cell_terminal term = { .id = cx + world.h*world.w }; + arrpush( world.io, term ); + row[ cx ++ ].state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT; + reg_end ++; + } + else if( *c == '#' ) + { + row[ cx ++ ].state = FLAG_WALL; + } + else + { + row[ cx ++ ].state = 0x00; + } + } + + c ++; + } + + vg_success( "Map loaded! (%u:%u)\n", world.w, world.h ); + return 1; +} int main( int argc, char *argv[] ) { @@ -62,8 +212,8 @@ void vg_start(void) float quad_mesh[] = { - 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, - 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f + 0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f, + 0.05f, 0.05f, 0.95f, 0.95f, 0.95f, 0.05f }; glBindVertexArray( world.tile_vao ); @@ -80,23 +230,102 @@ void vg_start(void) glEnableVertexAttribArray( 0 ); VG_CHECK_GL(); + + map_load + ( + "#############;\n" + "###-#####-###;aaa,aa\n" + "## ##;\n" + "## ##;\n" + "## ##;\n" + "## ##;\n" + "## ##;\n" + "## ##;\n" + "###+#####+###;aa,aaa\n" + "#############;\n" + ); } void vg_free(void) { glDeleteVertexArrays( 1, &world.tile_vao ); glDeleteBuffers( 1, &world.tile_vbo ); + + map_free(); } void vg_update(void) { float ratio = (float)vg_window_y / (float)vg_window_x; - float const size = 7.5f; + float const size = 9.5f; + + v3f origin; + origin[0] = -0.5f * world.w; + origin[1] = -0.5f * world.h; + origin[2] = 0.0f; m3x3_projection( m_projection, -size, size, size*ratio, -size*ratio ); m3x3_identity( m_view ); + m3x3_translate( m_view, origin ); m3x3_mul( m_projection, m_view, vg_pv ); vg_projection_update(); + + v2f tile_pos; + v2_copy( vg_mouse_ws, tile_pos ); + + int tile_x = floorf( tile_pos[0] ); + int tile_y = floorf( tile_pos[1] ); + + if( tile_x >= 2 && tile_x < world.w-2 && tile_y >= 2 && tile_y <= world.h-2 ) + { + world.selected = tile_y * world.w + tile_x; + + struct cell *cell = &world.data[tile_y*world.w+tile_x]; + if( cell->state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) ) + { + world.selected = -1; + } + else + { + if( vg_get_button_down("primary") ) + { + cell->state ^= FLAG_CANAL; + } + } + } + else + world.selected = -1; + + for( int y = 1; y < world.h-1; y ++ ) + { + for( int x = 1; x < world.w-1; x ++ ) + { + struct cell *cell = &world.data[y*world.w+x]; + + if( !(cell->state & FLAG_CANAL) ) + cell->water = 0; + + if( cell->state & FLAG_INPUT ) + cell->water = 8; + + if( cell->water ) + { + v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}}; + + for( int i = 0; i < vg_list_size( dirs ); i ++ ) + { + struct cell *neighbour = &world.data[(y+dirs[i][1])*world.w+x+dirs[i][0]]; + + if( neighbour->state & FLAG_CANAL ) + { + neighbour->water = vg_max( neighbour->water, cell->water-1 ); + } + } + + cell->water --; + } + } + } } void vg_render(void) @@ -116,10 +345,28 @@ void vg_render(void) for( int x = 0; x < world.w; x ++ ) { glUniform2f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)x, (float)y ); - glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f ); + + v4f colour; + + struct cell *cell = &world.data[y*world.w+x]; + + if( cell->state & FLAG_WALL ) { v4_copy( (v4f){ 0.2f, 0.2f, 0.2f, 1.0f }, colour ); } + else if( cell->state & FLAG_CANAL ) { v4_copy( (v4f){ 0.6f, 0.6f, 0.6f, 1.0f }, colour ); } + else if( cell->state & FLAG_INPUT ) { v4_copy( (v4f){ 0.2f, 0.3f, 0.7f, 1.0f }, colour ); } + else if( cell->state & FLAG_OUTPUT ) { v4_copy( (v4f){ 0.2f, 0.7f, 0.3f, 1.0f }, colour ); } + else v4_copy( (v4f){ 0.9f, 0.9f, 0.9f, 1.0f }, colour ); + + if( cell->water ) + v4_copy( (v4f){ 0.2f, 0.3f, 0.7f * (float)(cell->water) * (1.0f/8.0f), 1.0f }, colour ); + + if( world.selected == y*world.w + x ) + v3_muls( colour, sinf( vg_time )*0.25f + 0.5f, colour ); + + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, colour ); + glDrawArrays( GL_TRIANGLES, 0, 6 ); } } } -void vg_ui(void){} \ No newline at end of file +void vg_ui(void){}