From: hgn Date: Sun, 25 Jul 2021 16:42:22 +0000 (+0100) Subject: flow classification first pass X-Git-Url: https://skaterift.com/git/?a=commitdiff_plain;h=50a29fccd39d1a5535ffb0472614935cc306b517;p=fishladder.git flow classification first pass --- diff --git a/fishladder.c b/fishladder.c index 1f4634b..f6dc1e9 100644 --- a/fishladder.c +++ b/fishladder.c @@ -40,13 +40,13 @@ SHADER_DEFINE( tilemap_shader, "uniform mat4 uPv;" "uniform vec2 uOrigin;" "" - "out vec2 aCoords;" + "out vec4 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.0625;" + "aCoords = vec4((a_co*0.98+0.01 + vec2(a_data.x,0.0)) * 0.0625, a_data.zw);" "}", // FRAGMENT @@ -54,14 +54,14 @@ SHADER_DEFINE( tilemap_shader, "uniform sampler2D uTexRipples;" "uniform float uTime;" - "in vec2 aCoords;" + "in vec4 aCoords;" "out vec4 FragColor;" "void main()" "{" - "vec4 glyph = texture( uTexTiles, aCoords );" + "vec4 glyph = texture( uTexTiles, aCoords.xy );" "vec4 ripple = texture( uTexRipples, vec2( glyph.x - uTime, glyph.y ));" - "float wstatus = -(fract(uTime)*2.0-1.0);" // -1 := None in, 0.0 := Hold middle, 1.0 := All out + "float wstatus = -((aCoords.z/128.0)-1.0);" // -1 := None in, 0.0 := Hold middle, 1.0 := All out "float dev = step( 0.0, glyph.x+wstatus ) * step( glyph.x+wstatus, 1.0 );" //+ abs(glyph.y-0.5) );" "vec3 composite = mix( vec3(0.5,0.5,0.5), vec3(0.3,0.6,1.0) + ripple.xyz * 0.1, step( 0.75, glyph.a )*dev ) * glyph.z;" "FragColor = vec4( composite, 1.0 );" @@ -105,6 +105,7 @@ static struct int level; int state; + int flowing[2]; } * cells; @@ -212,23 +213,29 @@ static struct cell *map_stack_next(void) { struct vframe *frame = &map.stack.frames[ map.stack.level ]; - int output_dirs[][2] = { {0,-1}, {-1,0}, {1,0} }; + 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 ++; - + tile = map_tile_at_cond( (int[2]){frame->x+dir[0], frame->y+dir[1]}, CELL_FLAG_WALKABLE ); + 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]; + + tile->flags |= CELL_FLAG_VISITED; + + if( frame->i == 0 ) + frame->i = 400; } else tile = NULL; + + frame->i ++; } else { @@ -243,21 +250,27 @@ static struct cell *map_stack_next(void) return tile; } +static void map_stack_current_coords( int coords[2], int offset ) +{ + coords[0] = map.stack.frames[ map.stack.level+offset ].x; + coords[1] = map.stack.frames[ map.stack.level+offset ].y; +} + static void map_update_visual(void) { u8 celldata[ 4096 ]; - for( int i = 0; i < map.x*map.y; i ++ ) + static int compute_flow_counter = 0; + compute_flow_counter ^= 0x1; + + for( int i = 0; i < map.y*map.x; i ++ ) { - celldata[i*4+0] = i & 0x7; - celldata[i*4+1] = (i & ~0x7) >> 3; + map.cells[i].flowing[compute_flow_counter] = map.cells[i].flowing[compute_flow_counter^0x1]; + + if( map.cells[i].flowing[compute_flow_counter] ) + map.cells[i].flowing[compute_flow_counter] --; } - // Configurations - // DCBA | X Y - // 0001 3 0 - // 0010 - for( int y = 0; y < map.y; y ++ ) { for( int x = 0; x < map.x; x ++ ) @@ -275,19 +288,95 @@ static void map_update_visual(void) d = map_tile_at_cond( (int[2]){ x-1,y }, CELL_FLAG_WALKABLE ); u32 config = (a?0x1:0x0) | (b?0x2:0x0) | (c?0x4:0x0) | (d?0x8:0x0); - cellbytes[ 0 ] = config; - cellbytes[ 1 ] = 0; + + if( cur->flags & CELL_FLAG_OUTPUT ) + cur->flowing[ compute_flow_counter ] = 128; } else { // TODO: Random background tiles cellbytes[ 0 ] = 1; - cellbytes[ 1 ] = 0; } } } + int const k_rate_flow = 16; + + map_stack_refresh(); + for( int i = 0; i < arrlen( map.io ); i ++ ) + { + int inputcoord[2]; + if( map.cells[ map.io[i] ].flags & CELL_FLAG_OUTPUT ) + { + map_tile_coords_from_index( map.io[i], inputcoord ); + map_stack_init( inputcoord ); + struct cell *cell = map_tile_at( inputcoord ); + + int cr[2]; + + do + { + map_stack_current_coords( cr, 0 ); + + u8 *cellbytes = celldata + (cr[1]*map.x+cr[0])*4; + + if( cell->flowing[ compute_flow_counter ^ 0x1 ] == 128 ) + { + switch( cellbytes[0] ) + { + // DOWN + case 1: case 5: case 11: case 9: case 3: + map_tile( (int[2]){ cr[0], cr[1]+1 } )->flowing[ compute_flow_counter ] += k_rate_flow; + break; + + // R + case 2: case 6: + if( celldata[ (cr[1]*map.x+cr[0]+1)*4 ] != 14 ) + map_tile( (int[2]){ cr[0]+1, cr[1] } )->flowing[ compute_flow_counter ] += k_rate_flow; + break; + + // L + case 8: case 12: + if( celldata[ (cr[1]*map.x+cr[0]-1)*4 ] != 14 ) + map_tile( (int[2]){ cr[0]-1, cr[1] } )->flowing[ compute_flow_counter ] += k_rate_flow; + break; + + // L+R + case 10: case 14: + if( celldata[ (cr[1]*map.x+cr[0]+1)*4 ] != 14 ) + map_tile( (int[2]){ cr[0]+1, cr[1] } )->flowing[ compute_flow_counter ] += k_rate_flow; + if( celldata[ (cr[1]*map.x+cr[0]-1)*4 ] != 14 ) + map_tile( (int[2]){ cr[0]-1, cr[1] } )->flowing[ compute_flow_counter ] += k_rate_flow; + break; + default: break; + } + } + + if( cellbytes[0] == 10 ) + { + int crl[2]; + map_stack_current_coords( crl, -1 ); + + if( crl[0] < cr[0] ) + { + cellbytes[0] = 15; + } + } + } + while( (cell = map_stack_next()) ); + } + } + + for( int i = 0; i < map.y*map.x; i ++ ) + { + map.cells[i].flowing[ compute_flow_counter ] = vg_min( 128, map.cells[i].flowing[ compute_flow_counter ] ); + celldata[ i*4+2 ] = map.cells[i].flowing[ compute_flow_counter ]; + } + + // Trace out route + + glBindBuffer( GL_ARRAY_BUFFER, map.tiles_vbo ); glBufferSubData( GL_ARRAY_BUFFER, 16*sizeof(float) + 1024*2*sizeof(float), map.x*map.y*4, celldata ); } @@ -386,6 +475,7 @@ static int map_load( const char *str ) } row[ cx ].conditions = NULL; + row[ cx ].flowing[ 0 ] = 0; // Parse the various cell types if( *c == '+' || *c == '-' ) @@ -897,13 +987,14 @@ void vg_start(void) map_load ( - "#####-#####;aa\n" + "##-#####-##;aaa,aa\n" + "# #;\n" + "# #;\n" "# #;\n" "# #;\n" - "# -;bb\n" "# #;\n" "# #;\n" - "#####+#####;abab\n" + "##+#####+##;aa,aaa\n" ); }