"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
"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 );"
int level;
int state;
+ int flowing[2];
+ int source_count;
}
* cells;
{
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
{
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;
- }
+ struct cell *cell = map.cells + i;
+
+ cell->flowing[compute_flow_counter] = cell->flowing[compute_flow_counter^0x1];
+
+ if( !map.cells[i].source_count )
+ cell->flowing[ compute_flow_counter ] = vg_max( cell->flowing[ compute_flow_counter ] - 10, 0 );
- // Configurations
- // DCBA | X Y
- // 0001 3 0
- // 0010
+ map.cells[i].source_count = 0;
+ }
for( int y = 0; y < map.y; y ++ )
{
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;
+
+ int outflow = cell->flowing[ compute_flow_counter ^ 0x1 ];
+ int sourcing = outflow? 1: 0;
+ int outrate = outflow == 128? k_rate_flow: 0;
+
+ struct cell *a, *b, *d;
+ a = map_tile( (int[2]){ cr[0], cr[1]+1 } );
+ b = map_tile( (int[2]){ cr[0]+1, cr[1] } );
+ d = map_tile( (int[2]){ cr[0]-1, cr[1] } );
+
+ int compute_l = 0, compute_r = 0;
+
+ switch( cellbytes[0] )
+ {
+ // DOWN
+ case 1: case 5: case 11: case 9: case 3:
+ a->flowing[ compute_flow_counter ] += outrate;
+ a->source_count += sourcing;
+ break;
+ case 2: case 6: compute_r = 1; break;
+ case 8: case 12: compute_l = 1; break;
+ case 10: case 14: compute_l = 1; compute_r = 1; break;
+ default: break;
+ }
+
+ if( compute_r && (celldata[ (cr[1]*map.x+cr[0]+1)*4 ] != 14) )
+ {
+ b->flowing[ compute_flow_counter ] += outrate;
+ b->source_count += sourcing;
+ }
+
+ if( compute_l && (celldata[ (cr[1]*map.x+cr[0]-1)*4 ] != 14) )
+ {
+ d->flowing[ compute_flow_counter ] += outrate;
+ d->source_count += sourcing;
+ }
+
+ 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 ];
+ }
+
glBindBuffer( GL_ARRAY_BUFFER, map.tiles_vbo );
glBufferSubData( GL_ARRAY_BUFFER, 16*sizeof(float) + 1024*2*sizeof(float), map.x*map.y*4, celldata );
}
}
row[ cx ].conditions = NULL;
+ row[ cx ].flowing[ 0 ] = 0;
+ row[ cx ].source_count = 0;
// Parse the various cell types
if( *c == '+' || *c == '-' )
map_load
(
- "#####-#####;aa\n"
+ "##-#####-##;aaa,aa\n"
+ "# #;\n"
+ "# #;\n"
"# #;\n"
"# #;\n"
- "# -;bb\n"
"# #;\n"
"# #;\n"
- "#####+#####;abab\n"
+ "##+#####+##;aa,aaa\n"
);
}