X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=27bea90b33cd203526803093f5c7b51d482293fa;hb=e1ec22ea419f0fafe86566982bfff5060b784838;hp=bb261856b3661e59da76644867c4ec1c69e6f409;hpb=57a968ab8ebab8b69852c81697bc8cd27f4784ed;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index bb26185..27bea90 100644 --- a/fishladder.c +++ b/fishladder.c @@ -3,20 +3,16 @@ //#define VG_STEAM #include "vg/vg.h" -#define CELL_SHEET_X 256 -#define CELL_SHEET_Y 256 - -SHADER_DEFINE( colour_shader, +SHADER_DEFINE( shader_tile_colour, // VERTEX "layout (location=0) in vec2 a_co;" - "uniform mat4 uPv;" - "uniform mat4 uMdl;" + "uniform mat3 uPv;" + "uniform vec2 uOffset;" "" "void main()" "{" - " vec4 vert_pos = uPv * uMdl * vec4( a_co.x, 0.0, a_co.y, 1.0 );" - " gl_Position = vert_pos;" + "gl_Position = vec4( uPv * vec3( a_co + uOffset, 1.0 ), 1.0 );" "}", // FRAGMENT @@ -25,246 +21,83 @@ SHADER_DEFINE( colour_shader, "" "void main()" "{" - " FragColor = uColour;" - "}" - , - UNIFORMS({ "uPv", "uMdl", "uColour" }) -) - -SHADER_DEFINE( tilemap_shader, - - // VERTEX - "layout (location=0) in vec2 a_co;" // XY - "layout (location=1) in vec2 a_offset;" // XY offset - "layout (location=2) in vec4 a_data;" // atlas-uv, amt, other - "uniform mat4 uPv;" - "uniform vec2 uOrigin;" - "" - "out vec2 aCoords;" - "" - "void main()" - "{" - "vec2 world_coord = a_co+a_offset+uOrigin;" - "gl_Position = uPv * vec4( world_coord.x, 0.0, world_coord.y, 1.0 );" - "aCoords = (a_co*0.98+0.01 + a_data.xy) * 0.125;" - "}", - - // FRAGMENT - "uniform sampler2D uTexTiles;" - - "in vec2 aCoords;" - "out vec4 FragColor;" - - "void main()" - "{" - "vec4 glyph = texture( uTexTiles, aCoords );" - "FragColor = vec4( glyph.xyz, 1.0 );" + "FragColor = uColour;" "}" , - UNIFORMS({ "uPv", "uTexTiles", "uOrigin" }) + UNIFORMS({ "uPv", "uOffset", "uColour" }) ) -mat4 m_projection; -mat4 m_view; -mat4 m_mdl; +m3x3f m_projection; +m3x3f m_view; +m3x3f m_mdl; -int main( int argc, char *argv[] ) -{ - vg_init( argc, argv, "FishLadder" ); -} - -#define CELL_FLAG_INPUT 0x1 -#define CELL_FLAG_OUTPUT 0x2 - #define CELL_FLAG_IO (CELL_FLAG_INPUT|CELL_FLAG_OUTPUT) -#define CELL_FLAG_WALL 0x4 -#define CELL_FLAG_HOVER 0x8 -#define CELL_FLAG_ITER 0x10 -#define CELL_FLAG_CANAL 0x20 -#define CELL_FLAG_SPLIT 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 -#define CELL_FLAG_UPLVL 0x100 -#define CELL_FLAG_MERGE 0x200 +#define FLAG_INPUT 0x1 +#define FLAG_OUTPUT 0x2 +#define FLAG_CANAL 0x4 +#define FLAG_WALL 0x8 +#define FLAG_DROP 0x10 +#define FLAG_SPLIT 0x20 -static struct +struct world { - u32 x,y; - struct cell - { - u32 flags; - u32 model_id; - - char *conditions; - - int level; - int state; - } - * cells; - - struct fish { - int alive; - int co[2]; - int dir[2]; - char data; + u32 state; + u8 water[2]; + u8 config; } - fishes[ 20 ]; - int num_fishes; + *data; - vec3 origin; - struct cell *selected; - int select_valid; - int playing; u32 frame; - u32 *io; - - struct vstack + struct cell_terminal { - struct vframe - { - int x, y; - int i; - } - frames[ 64 ]; - - int level; - u32 flags; + char *conditions; + int id; } - stack; - - GLuint tile_texture; - GLuint flow_texture; + *io; - GLuint tiles_vao; - GLuint tiles_vbo; -} -map; - -static void map_free(void) -{ - for( int i = 0; i < arrlen( map.io ); i ++ ) - { - arrfree( map.cells[ map.io[i] ].conditions ); - } - - arrfree( map.cells ); - arrfree( map.io ); - map.x = 0; - map.y = 0; - map.cells = NULL; - map.io = NULL; -} - -static struct cell *map_tile_at( int pos[2] ) -{ - if( pos[0] >= 0 && pos[0] < map.x && pos[1] >= 0 && pos[1] < map.y ) - return map.cells + pos[1]*map.x + pos[0]; - return NULL; -} - -static struct cell *map_tile_at_cond( int pos[2], u32 flags ) -{ - struct cell *cell = map_tile_at( pos ); - if( cell && (cell->flags & flags) ) - return cell; - - return NULL; -} - -static 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; + u32 w, h; - 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; - } - } + GLuint tile_vao; + GLuint tile_vbo; - return tile; -} + int selected; +} world = {}; -static void map_update_visual(void) +static void map_free(void) { - u8 celldata[ 4096 ]; + for( int i = 0; i < arrlen( world.io ); i ++ ) + arrfree( world.io[ i ].conditions ); - for( int i = 0; i < map.x*map.y; i ++ ) - { - celldata[i*4+0] = i & 0x7; - celldata[i*4+1] = (i & ~0x7) >> 3; - } + arrfree( world.data ); + arrfree( world.io ); - glBindBuffer( GL_ARRAY_BUFFER, map.tiles_vbo ); - glBufferSubData( GL_ARRAY_BUFFER, 16*sizeof(float) + 1024*2*sizeof(float), map.x*map.y*4, celldata ); + world.w = 0; + world.h = 0; + world.data = NULL; + world.io = NULL; } static int map_load( const char *str ) { map_free(); - char *c = str; + char const *c = str; // Scan for width - for(;; map.x ++) + for(;; world.w ++) { - if( str[map.x] == ';' ) + if( str[world.w] == ';' ) break; - else if( !str[map.x] ) + else if( !str[world.w] ) { - vg_error( "Unexpected EOF when parsing level!\n" ); + vg_error( "Unexpected EOF when parsing level\n" ); return 0; } } - struct cell *row = arraddnptr( map.cells, map.x ); + struct cell *row = arraddnptr( world.data, world.w ); int cx = 0; int reg_start = 0, reg_end = 0; @@ -286,7 +119,7 @@ static int map_load( const char *str ) { if( *c >= 'a' && *c <= 'z' ) { - arrpush( map.cells[ map.io[ reg_start ] ].conditions, *c ); + arrpush( world.io[ reg_start ].conditions, *c ); } else { @@ -299,14 +132,14 @@ static int map_load( const char *str ) } else { - vg_error( "Unkown attrib '%c' (row: %u)\n", *c, map.y ); + vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h ); return 0; } } } else { - vg_error( "Over-assigned values (row: %u)\n", map.y ); + vg_error( "Too many values to assign (row: %u)\n", world.h ); return 0; } @@ -316,560 +149,434 @@ static int map_load( const char *str ) if( reg_start != reg_end ) { - vg_error( "Not enough values assigned (row: %u, %u of %u)\n", map.y, 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 != map.x ) + if( cx != world.w ) { - vg_error( "Map row underflow (row: %u, %u<%u)\n", map.y, cx, map.x ); + vg_error( "Not enough cells to match previous row definition (row: %u, %u<%u)\n", world.h, cx, world.w ); return 0; } - row = arraddnptr( map.cells, map.x ); + row = arraddnptr( world.data, world.w ); cx = 0; - map.y ++; - reg_end = reg_start = arrlen( map.io ); + world.h ++; + reg_end = reg_start = arrlen( world.io ); } else { - if( cx == map.x ) + if( cx == world.w ) { - vg_error( "Map row overflow (row: %u, %u>%u)\n", map.y, cx, map.x ); + vg_error( "Too many cells to match previous row definition (row: %u, %u>%u)\n", world.h, cx, world.w ); return 0; } - row[ cx ].conditions = NULL; - - // Parse the various cell types + // Tile initialization + // row[ cx ] .. etc + row[ cx ].water[0] = 0; + row[ cx ].water[1] = 0; + if( *c == '+' || *c == '-' ) { - arrpush( map.io, cx + map.y*map.x ); - row[ cx ++ ].flags = *c == '+'? CELL_FLAG_INPUT: CELL_FLAG_OUTPUT; + 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 ++ ].flags = CELL_FLAG_WALL; + row[ cx ++ ].state = FLAG_WALL; } else { - row[ cx ++ ].flags = 0x00; + row[ cx ++ ].state = 0x00; } } c ++; } - // Origin top left corner - map.origin[0] = -((float)map.x) * 0.5f; - map.origin[2] = -((float)map.y) * 0.5f; - - float *offset_array = (float *)malloc( map.x*map.y*2*sizeof(float) ); + vg_success( "Map loaded! (%u:%u)\n", world.w, world.h ); + return 1; +} + +int main( int argc, char *argv[] ) +{ + vg_init( argc, argv, "FishLadder" ); +} + +void vg_register(void) +{ + SHADER_INIT( shader_tile_colour ); +} + +void vg_start(void) +{ + glGenVertexArrays( 1, &world.tile_vao ); + glGenBuffers( 1, &world.tile_vbo ); - for( int y = 0; y < map.y; y ++ ) + float quad_mesh[] = { - for( int x = 0; x < map.x; x ++ ) - { - float *coord = offset_array + (y*map.x+x)*2; - coord[0] = x; - coord[1] = y; - } - } + 0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f, + 0.05f, 0.05f, 0.95f, 0.95f, 0.95f, 0.05f + }; - glBindBuffer( GL_ARRAY_BUFFER, map.tiles_vbo ); - glBufferSubData( GL_ARRAY_BUFFER, 16*sizeof(float), map.x*map.y*2*sizeof(float), offset_array ); + glBindVertexArray( world.tile_vao ); + glBindBuffer( GL_ARRAY_BUFFER, world.tile_vbo ); + glBufferData + ( + GL_ARRAY_BUFFER, + sizeof( quad_mesh ), + quad_mesh, + GL_STATIC_DRAW + ); - free( offset_array ); - vg_success( "Map loaded! (%u:%u)\n", map.x, map.y ); - return 1; + glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0 ); + 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(); } -static int map_tile_availible( int co[2] ) +static int cell_interactive( v2i co ) { + // Bounds check + if( co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2 ) + return 0; + + // Flags check + if( world.data[ world.w*co[1] + co[0] ].state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) ) + return 0; + + // List of 3x3 configurations that we do not allow + static u32 invalid_src[][9] = + { + { 0,1,0, + 1,1,1, + 0,1,0 + }, + { 0,0,0, + 0,1,1, + 0,1,1 + }, + { 0,0,0, + 1,1,0, + 1,1,0 + }, + { 0,1,1, + 0,1,1, + 0,0,0 + }, + { 1,1,0, + 1,1,0, + 0,0,0 + }, + { 0,1,0, + 0,1,1, + 0,1,0 + }, + { 0,1,0, + 1,1,0, + 0,1,0 + } + }; + + // Statically compile invalid configurations into bitmasks + static u32 invalid[ vg_list_size(invalid_src) ]; + + for( int i = 0; i < vg_list_size(invalid_src); i ++ ) + { + u32 comped = 0x00; + + for( int j = 0; j < 3; j ++ ) + for( int k = 0; k < 3; k ++ ) + comped |= invalid_src[i][ j*3+k ] << ((j*5)+k); + + invalid[i] = comped; + } + // 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) ) + for( int y = co[1]-2; y < co[1]+3; y ++ ) + for( int x = co[0]-2; x < co[0]+3; x ++ ) + { + struct cell *cell = &world.data[ world.w*y + x ]; + + if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT)) ) 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 0; } } - + return 1; } void vg_update(void) { - // Update camera float ratio = (float)vg_window_y / (float)vg_window_x; - float const size = 7.5f; - glm_ortho( -size, size, -size*ratio, size*ratio, 0.01f, 150.f, m_projection ); - - glm_mat4_identity( m_view ); - glm_translate_z( m_view, -10.f ); - glm_rotate_x( m_view, 1.5708f, m_view ); + float const size = 9.5f; - glm_mat4_mul( m_projection, m_view, vg_pv ); + 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( cell_interactive( (v2i){ tile_x, tile_y } )) + { + world.selected = tile_y * world.w + tile_x; + + if( vg_get_button_down("primary") ) + { + world.data[ world.selected ].state ^= FLAG_CANAL; + } + } + else + world.selected = -1; - // Compute map update - for( int y = 0; y < map.y; y ++ ) + // Reclassify world. TODO: Move into own function + for( int y = 2; y < world.h-2; y ++ ) { - for( int x = 0; x < map.x; x ++ ) + for( int x = 2; x < world.w-2; x ++ ) { - struct cell *tile, *upper, *lower, *l, *r; - tile = map_tile_at( (int [2]){ x, y } ); - tile->flags &= ~(CELL_FLAG_SPLIT|CELL_FLAG_MERGE|CELL_FLAG_UPLVL); + v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}}; + + u8 config = 0x00; - if( tile->flags & CELL_FLAG_WALKABLE ) + if( world.data[y*world.w+x].state & FLAG_CANAL ) { - r = map_tile_at_cond( (int[2]){ x+1, y }, CELL_FLAG_WALKABLE ); - l = map_tile_at_cond( (int[2]){ x-1, y }, CELL_FLAG_WALKABLE ); - - if( r && l ) + for( int i = 0; i < vg_list_size( dirs ); i ++ ) { - upper = map_tile_at_cond( (int[2]){ x, y-1 }, CELL_FLAG_WALKABLE ); - lower = map_tile_at_cond( (int[2]){ x, y+1 }, CELL_FLAG_WALKABLE ); - - if( upper ) - { - tile->flags |= CELL_FLAG_MERGE | CELL_FLAG_UPLVL; - } - - if( lower ) - { - tile->flags |= CELL_FLAG_SPLIT; - l->flags |= CELL_FLAG_UPLVL; - r->flags |= CELL_FLAG_UPLVL; - } + struct cell *neighbour = &world.data[(y+dirs[i][1])*world.w+x+dirs[i][0]]; + if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) ) + config |= 0x1 << i; } - } + } else config = 0xF; + + world.data[ y*world.w+x ].config = config; + world.data[ y*world.w+x ].state &= ~(FLAG_DROP|FLAG_SPLIT); } } - // Compute classification - /* - map_stack_refresh(); - - for( int i = 0; i < arrlen( map.io ); i ++ ) - { - struct *cell cell = &map.cells[ map.io ]; - int coords[2]; - - if( cell->flags & CELL_FLAG_INPUT ) + for( int y = 2; y < world.h-2; y ++ ) + for( int x = 2; x < world.w-2; x ++ ) { - map_tile_coords_from_index( map.io, coords ); - map_stack_init( coords ); + // R,D,L,- 1110 (splitter, 1 drop created) + + // R,-,L,U - 1011 (merger, 2 drop created) - do + u8 config = world.data[y*world.w+x].config; + + if( config == 0x7 ) { - if( cell->flags & CELL_FLAG_CONNECTOR ) - { - - } + world.data[y*world.w+x ].state |= (FLAG_SPLIT | FLAG_DROP); + } + else if( config == 0xD ) + { + world.data[y*world.w+x-1].state |= FLAG_DROP; + world.data[y*world.w+x+1].state |= FLAG_DROP; } - while( (cell = map_stack_next()) ); } - }*/ - - // Get mouse ray - vec3 ray_origin; - vec3 ray_dir; - - mat4 pv_inverse; - vec4 vp = { 0.f, 0.f, vg_window_x, vg_window_y }; - glm_mat4_inv( vg_pv, pv_inverse ); - glm_unprojecti( (vec3){ vg_mouse_x, vg_window_y-vg_mouse_y, -1.f }, pv_inverse, vp, ray_dir ); - glm_unprojecti( (vec3){ vg_mouse_x, vg_window_y-vg_mouse_y, 0.f }, pv_inverse, vp, ray_origin ); - glm_vec3_sub( ray_dir, ray_origin, ray_dir ); - - // Get floor tile intersection - float ray_t = -ray_origin[1] / ray_dir[1]; - - vec3 tile_pos; - glm_vec3_copy( ray_origin, tile_pos ); - glm_vec3_muladds( ray_dir, ray_t, tile_pos ); - glm_vec3_sub( tile_pos, map.origin, tile_pos ); - int tile_x = floorf( tile_pos[0] ); - int tile_y = floorf( tile_pos[2] ); + /* + canals + x + xxxxx + x x + x xxx + x x x + x xxx + x x + xxxxx + x + x + + configs (Downlevels marked) + x + xDxDx + x x + x DxD + x x x + x xDx + x x + xxxDx + x + x + + Path tracing with min function + 0 + 11011 + 1 . + 1 D.D + 1 . . + 1 .D. + 1 . + 1112. + 2 + 2 + + Path tracing with min function + 0 + 11011 + 1 1 + 1 212 + 1 2 2 + 1 232 + 1 3 + 11143 + 4 + 4 + + L to R fill + 0000000 + 1101111 + 1111111 + 1112122 + 1112222 + 1112322 + 1111333 + 1114333 + 4444444 + 4444444 + */ - map.selected = map_tile_at( (int [2]){tile_x, tile_y} ); + // Simulate world + static int update_tick = 0; + update_tick ++; - if( map.playing ) + if( update_tick > 5 ) { - static int fish_counter = 0; - fish_counter ++; - - if( fish_counter > 20 ) + update_tick = 0; + + u32 buffer_id = world.frame & 0x1; + u32 buffer_next = buffer_id ^ 0x1; + + for( int y = 1; y < world.h-1; y ++ ) { - fish_counter = 0; - - // Advance characters - for( int i = 0; i < map.num_fishes; i ++ ) + for( int x = 1; x < world.w-1; x ++ ) { - 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_SPLIT ) + struct cell *cell = &world.data[y*world.w+x]; + + if( cell->state & (FLAG_OUTPUT|FLAG_DROP) ) + cell->water[ buffer_next ] = 16; + else { - die = 1; - int new_dir[][2] = { {0,-1},{1,0},{-1,0} }; - int *test_dir; + int has_source = 0; + cell->water[ buffer_next ] = 0; - 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]; - } - - // Try spawn fish - for( int i = 0; i < arrlen( map.io ); i ++ ) - { - struct cell *input = &map.cells[ map.io[i] ]; - - if( input->flags & CELL_FLAG_INPUT ) - { - if( input->state < arrlen( input->conditions ) ) + if( cell->state & FLAG_CANAL ) { - 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; + v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}}; - for( int i = 0; i < vg_list_size( output_dirs ); i ++ ) + for( int i = 0; i < vg_list_size( 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 ) + struct cell *neighbour = &world.data[(y+dirs[i][1])*world.w+x+dirs[i][0]]; + + if( neighbour->water[ buffer_id ] > cell->water[ buffer_next ]+1 ) { - fish->dir[0] = dir[0]; - fish->dir[1] = dir[1]; - can_spawn = 1; + has_source = 1; + cell->water[ buffer_next ] = neighbour->water[ buffer_id ]-1; } } - - if( can_spawn ) - { - fish->alive = 1; - input->state ++; - map.num_fishes ++; - } } + + if( !has_source && cell->water[ buffer_id ] ) + cell->water[ buffer_next ] = cell->water[ buffer_id ]-1; } } - - 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.selected ) - { - map.select_valid = map_tile_availible( (int[2]){ tile_x, tile_y } ); - - if( map.select_valid ) - { - if( vg_get_button_down("primary") ) - { - if( map.selected->flags & CELL_FLAG_CANAL ) - { - map.selected->flags &= ~(CELL_FLAG_CANAL); - } - else - { - map.selected->flags |= CELL_FLAG_CANAL; - } - } - } - } + world.frame ++; } } -GLuint tile_vao; -GLuint tile_vbo; - void vg_render(void) { glViewport( 0,0, vg_window_x, vg_window_y ); - //glEnable( GL_DEPTH_TEST ); - glClearColor( 0.94f, 0.94f, 0.94f, 1.0f ); + glDisable( GL_DEPTH_TEST ); + glClearColor( 0.01f, 0.01f, 0.01f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - /* - glBindVertexArray( tile_vao ); - - SHADER_USE( colour_shader ); - glUniformMatrix4fv( SHADER_UNIFORM( colour_shader, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); + glBindVertexArray( world.tile_vao ); + SHADER_USE( shader_tile_colour ); + glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); - for( int y = 0; y < map.y; y ++ ) + for( int y = 0; y < world.h; y ++ ) { - for( int x = 0; x < map.x; x ++ ) + for( int x = 0; x < world.w; x ++ ) { - glm_mat4_identity( m_mdl ); - glm_translate( m_mdl, - (vec3){ - map.origin[0] + (float)x, - 0.f, - map.origin[2] + (float)y - } - ); - glUniformMatrix4fv( SHADER_UNIFORM( colour_shader, "uMdl" ), 1, GL_FALSE, (float *)m_mdl ); + glUniform2f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)x, (float)y ); - struct cell *cell = &map.cells[ y*map.x+x ]; + v4f colour; - vec4 colour = { 0.7f, 0.7f, 0.7f, 1.f }; + struct cell *cell = &world.data[y*world.w+x]; - if( cell->flags & CELL_FLAG_INPUT ) glm_vec3_copy( (vec3){ 0.9f,0.5f,0.5f }, colour ); - else if( cell->flags & CELL_FLAG_OUTPUT ) glm_vec3_copy( (vec3){ 0.5f,0.9f,0.5f }, colour ); - else if( cell->flags & CELL_FLAG_WALL ) glm_vec3_copy( (vec3){ 0.1f,0.1f,0.1f }, colour ); - else if( cell->flags & CELL_FLAG_CANAL ) glm_vec3_copy( (vec3){ 0.5f,0.5f,0.8f }, colour ); + 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->flags & CELL_FLAG_SPLIT ) - glm_vec3_copy( (vec3){ 0.6f, 0.f, 0.9f }, colour ); - else if( cell->flags & CELL_FLAG_MERGE ) - glm_vec3_copy( (vec3){ 0.f, 0.6f, 0.8f }, colour ); + if( cell->water[world.frame&0x1] ) + v4_copy( (v4f){ 0.2f, 0.3f, 0.7f * (float)(cell->water[world.frame&0x1]) * (1.0f/8.0f), 1.0f }, colour ); - if( map.selected == cell ) - { - if( !map.select_valid ) - glm_vec3_copy( (vec3){ 1.f, 0.f, 0.f }, colour ); + if( world.selected == y*world.w + x ) + v3_muls( colour, sinf( vg_time )*0.25f + 0.5f, colour ); + + if( cell->state & (FLAG_DROP|FLAG_SPLIT) ) + v4_copy( (v4f){ 0.75f, 0.75f, 0.02f, 1.0f }, colour ); + + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, colour ); - float flash = sinf( vg_time*2.5f ) * 0.25f + 0.75f; - glm_vec3_scale( colour, flash, colour ); - } - - glUniform4fv( SHADER_UNIFORM( colour_shader, "uColour" ), 1, colour ); - 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 ); } } - */ - - glBindVertexArray( map.tiles_vao ); - - map_update_visual(); - - SHADER_USE( tilemap_shader ); - glUniformMatrix4fv( SHADER_UNIFORM( tilemap_shader, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); - - glUniform1i( SHADER_UNIFORM( tilemap_shader, "uTexTiles" ), 0 ); - glActiveTexture( GL_TEXTURE0 ); - glBindTexture( GL_TEXTURE_2D, map.tile_texture ); - - glUniform2f( SHADER_UNIFORM( tilemap_shader, "uOrigin" ), map.origin[0], map.origin[2] ); - - glDrawArraysInstanced( GL_TRIANGLES, 0, 6, map.x*map.y ); -} - -void vg_register(void) -{ - SHADER_INIT( colour_shader ); - SHADER_INIT( tilemap_shader ); -} - -void vg_start(void) -{ - glGenVertexArrays( 1, &tile_vao ); - glGenBuffers( 1, &tile_vbo ); - - 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, - - // Padding - 0.0f, 0.0f, 0.0f, 0.0f - }; - - glBindVertexArray( tile_vao ); - glBindBuffer( GL_ARRAY_BUFFER, tile_vbo ); - glBufferData - ( - GL_ARRAY_BUFFER, - sizeof( quad_mesh ), - quad_mesh, - GL_STATIC_DRAW - ); - - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0 ); - glEnableVertexAttribArray( 0 ); - - VG_CHECK_GL(); - - // Create map buffers - glGenVertexArrays( 1, &map.tiles_vao ); - glGenBuffers( 1, &map.tiles_vbo ); - - glBindVertexArray( map.tiles_vao ); - glBindBuffer( GL_ARRAY_BUFFER, map.tiles_vbo ); - glBufferData( GL_ARRAY_BUFFER, - sizeof( quad_mesh ) + - sizeof( float )*2 * 1024 + - sizeof( u8 )*4 * 1024, - NULL, - GL_DYNAMIC_DRAW - ); - - glBufferSubData( GL_ARRAY_BUFFER, 0, sizeof( quad_mesh ), quad_mesh ); - - // Base quad - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 ); - glEnableVertexAttribArray( 0 ); - - // Offset, data arrays (instancing) - glVertexAttribPointer( 1, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)(sizeof(quad_mesh)) ); - glEnableVertexAttribArray( 1 ); - glVertexAttribDivisor( 1, 1 ); - - glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_FALSE, 4, (void*)(sizeof(quad_mesh)+sizeof(float)*2*1024) ); - glEnableVertexAttribArray( 2 ); - glVertexAttribDivisor( 2, 1 ); - - map.tile_texture = vg_tex2d_rgba( "textures/rivertiles_flowm.tga" ); - vg_tex2d_nearest(); - vg_tex2d_repeat(); - - map.flow_texture = vg_tex2d_rgba( "textures/rivertiles_ripple.tga" ); - - - map_load - ( - "#####-#####;aa\n" - "# #;\n" - "# #;\n" - "# -;bb\n" - "# #;\n" - "# #;\n" - "#####+#####;abab\n" - ); } -void vg_free(void) -{ - map_free(); - - glDeleteVertexArrays( 1, &tile_vao ); - glDeleteVertexArrays( 1, &map.tiles_vao ); - - glDeleteBuffers( 1, &tile_vbo ); - glDeleteBuffers( 1, &map.tiles_vbo ); - - glDeleteTextures( 1, &map.tile_texture ); - glDeleteTextures( 1, &map.flow_texture ); -} - -void vg_ui(void) -{ - -} +void vg_ui(void){}