X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=bcbc37428b6335433bd2ff7306feb337aeab982d;hb=f98aae8c634505a899a2feaec34af873d90227cc;hp=66a3eba09c6987d391f27df522135e8022294ede;hpb=2f9157326993b3e6098468cd310dd20d75205645;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 66a3eba..bcbc374 100644 --- a/fishladder.c +++ b/fishladder.c @@ -9,92 +9,94 @@ const char *level_pack_1[] = { "level1", "level2", "level3", - "level4" + "level4", + "level5", + "level6", + "level7_combine" }; -const char *level_pack[] = +#pragma pack(push,1) +struct career_state { - // Level 0 - "#########;\n" - "###-#####;acac\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "#####+###;acac\n" - "#########;\n", - - // Level 1 - "#########;\n" - "##-###-##;b,b\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "####+####;bb\n" - "#########;\n", - - // Level 2 - "###########;\n" - "#####-#####;bbbbb\n" - "## ##;\n" - "## ###;\n" - "## # ##;\n" - "## ##;\n" - "###+##+####;bbb,bb\n" - "###########;\n", - - // Level 3 - "#############;\n" - "###-#####-###;a,aaa\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "######+######;aaaa\n" - "#############;\n", - - // Level 4 - "#############;\n" - "###-#####-###;aaa,aa\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "###+#####+###;aa,aaa\n" - "#############;\n", - - // Level 5 - "###############;\n" - "####-##########;abcb\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "## ##;\n" - "##########+####;bcba\n" - "###############;\n" -}; + u32 version; + + struct career_level + { + u32 score; + u32 time; + u32 completed; + } + levels[ vg_list_size( level_pack_1 ) ]; +} +career = { .version = 1 }; +#pragma pack(pop) + +static void career_serialize(void) +{ + vg_asset_write( "sav/game.sav", &career, sizeof( struct career_state ) ); +} + +static void career_load(void) +{ + i64 sz; + struct career_state *cr = vg_asset_read_s( "sav/game.sav", &sz ); + + memset( (void*)career.levels, 0, vg_list_size(level_pack_1) * sizeof(struct career_level) ); + + if( cr ) + { + if( sz > sizeof( struct career_state ) ) + vg_warn( "This save file is too big! Some levels will be lost\n" ); + + if( sz <= offsetof( struct career_state, levels ) ) + { + vg_error( "This save file is too small to have a header\n" ); + free( cr ); + return; + } + + u32 const size_header = offsetof(struct career_state, levels); + u32 const size_levels = sizeof(struct career_state)-size_header; + u32 const size_levels_input = sz - size_header; + + memcpy( (void*)career.levels, (void*)cr->levels, size_levels_input ); + + if( sz < sizeof( struct career_state ) ) + { + memset( ((void*)career.levels) + size_levels_input, 0, size_levels-size_levels_input ); + } + + free( cr ); + vg_success( "Loaded save file... Info:\n" ); + + for( int i = 0; i < vg_list_size( career.levels ); i ++ ) + { + struct career_level *lvl = &career.levels[i]; + vg_info( "Score: %u, Time: %u, Completed: %u\n", lvl->score, lvl->time, lvl->completed ); + } + } + else + { + vg_info( "No save file... Using blank one\n" ); + } +} 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 +#define FLAG_CANAL 0x1 +#define FLAG_IS_TRIGGER 0x2 +#define FLAG_RESERVED0 0x4 +#define FLAG_RESERVED1 0x8 + +#define FLAG_INPUT 0x10 +#define FLAG_OUTPUT 0x20 +#define FLAG_WALL 0x40 + #define FLAG_FLIP_FLOP 0x100 #define FLAG_FLIP_ROTATING 0x200 +#define FLAG_TARGETED 0x400 /* 0000 0 | 0001 1 | 0010 2 | 0011 3 @@ -150,7 +152,7 @@ struct mesh u32 elements; }; -static void init_mesh( struct mesh *m, float *tris, u32 length ) +static void init_mesh( struct mesh *m, float const *tris, u32 length ) { m->elements = length/3; glGenVertexArrays( 1, &m->vao ); @@ -184,34 +186,51 @@ static void use_mesh( struct mesh *m ) struct world { +#pragma pack(push,1) struct cell { - u32 state; + u16 state; + u16 links[2]; u8 config; + u8 pad0; } *data; +#pragma pack(pop) - u32 frame; + int frame; - u32 sim_frame; + int initialzed; + + int sim_frame; float sim_start; int simulating; + int sim_run, max_runs; float frame_lerp; struct cell_terminal { - // TODO: Split into input/output structures - char *conditions; - char recv[12]; - int recv_count; + //char *conditions; + //char recv[12]; + + struct terminal_run + { + char conditions[8]; + char recieved[8]; + + int condition_count, recv_count; + } + runs[8]; + + int run_count; + int id; } *io; - u32 w, h; + int w, h; - struct mesh tile, circle; + struct mesh tile, circle, numbers; GLuint background_data; GLuint random_samples; @@ -234,13 +253,16 @@ struct world int num_fishes; char map_name[128]; + struct career_level *ptr_career_level; + + u32 score; + u32 completed; + u32 time; + } 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 ); @@ -248,11 +270,18 @@ static void map_free(void) world.h = 0; world.data = NULL; world.io = NULL; + world.score = 0; + world.time = 0; + world.completed = 0; + world.max_runs = 0; + world.initialzed = 0; } static void map_reclassify( v2i start, v2i end, int update_texbuffer ); static int map_load( const char *str, const char *name ) { + //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data + map_free(); char const *c = str; @@ -273,6 +302,12 @@ static int map_load( const char *str, const char *name ) int cx = 0; int reg_start = 0, reg_end = 0; + u32 *links_to_make = NULL; + int links_satisfied = 0; + + char link_id_buffer[32]; + int link_id_n = 0; + for(;;) { if( !*c ) @@ -289,9 +324,12 @@ static int map_load( const char *str, const char *name ) { if( reg_start < reg_end ) { + struct cell_terminal *terminal = &world.io[ reg_start ]; + struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ]; + if( *c >= 'a' && *c <= 'z' ) - { - arrpush( world.io[ reg_start ].conditions, *c ); + { + run->conditions[ run->condition_count ++ ] = *c; } else { @@ -302,46 +340,97 @@ static int map_load( const char *str, const char *name ) if( *c == '\n' ) break; } + else if( *c == ':' ) + { + terminal->runs[ terminal->run_count ].condition_count = 0; + terminal->run_count ++; + world.max_runs = vg_max( world.max_runs, terminal->run_count ); + } else { vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h ); - return 0; + goto IL_REG_ERROR; } } } else { - vg_error( "Too many values to assign (row: %u)\n", world.h ); - return 0; + if( links_satisfied < arrlen( links_to_make ) ) + { + struct cell *target = &world.data[ links_to_make[ links_satisfied ] ]; + + if( (((u32)*c >= (u32)'0') && ((u32)*c <= (u32)'9')) || *c == '-' ) + { + if( link_id_n >= vg_list_size( link_id_buffer )-1 ) + { + vg_error( "Number was way too long to be parsed (row: %u)\n", world.h ); + goto IL_REG_ERROR; + } + + link_id_buffer[ link_id_n ++ ] = *c; + } + else if( *c == ',' || *c == '\n' ) + { + link_id_buffer[ link_id_n ] = 0x00; + int value = atoi( link_id_buffer ); + + target->links[value >= 0? 1:0] = abs(value); + links_satisfied ++; + link_id_n = 0; + + if( *c == '\n' ) + break; + } + else + { + vg_error( "Invalid character '%c' (row: %u)\n", *c, world.h ); + goto IL_REG_ERROR; + } + } + else + { + vg_error( "Too many values to assign (row: %u)\n", world.h ); + goto IL_REG_ERROR; + } } c ++; } } + // Registry length-error checks 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; + vg_error( "Not enough spawn values assigned (row: %u, %u of %u)\n", world.h, reg_start, reg_end ); + goto IL_REG_ERROR; + } + + if( links_satisfied != arrlen( links_to_make ) ) + { + vg_error( "Not enough link values assigned (row: %u, %u of %u)\n", world.h, links_satisfied, arrlen( links_to_make ) ); + goto IL_REG_ERROR; } 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; + goto IL_REG_ERROR; } row = arraddnptr( world.data, world.w ); cx = 0; world.h ++; reg_end = reg_start = arrlen( world.io ); + + arrsetlen( links_to_make, 0 ); + links_satisfied = 0; } 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; + goto IL_REG_ERROR; } // Tile initialization @@ -350,13 +439,32 @@ static int map_load( const char *str, const char *name ) if( *c == '+' || *c == '-' ) { - struct cell_terminal term = { .id = cx + world.h*world.w }; - arrpush( world.io, term ); + struct cell_terminal *term = arraddnptr( world.io, 1 ); + term->id = cx + world.h*world.w; + term->run_count = 1; + term->runs[0].condition_count = 0; + cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT; reg_end ++; } else if( *c == '#' ) cell->state = FLAG_WALL; - else if( *c == '*' ) cell->state = FLAG_CANAL; + else if( ((u32)*c >= (u32)'A') && ((u32)*c <= (u32)'A'+0xf) ) + { + // Canal flag bits (4bit/16 value): + // 0: Canal present + // 1: Is trigger + // 2: Reserved + // 3: Reserved + + cell->state = ((u32)*c - (u32)'A') & (FLAG_CANAL|FLAG_IS_TRIGGER); + + if( cell->state & FLAG_IS_TRIGGER ) + arrpush( links_to_make, cx + world.h*world.w ); + + cell->links[0] = 0; + cell->links[1] = 0; + world.score ++; + } else cell->state = 0x00; cx ++; @@ -364,7 +472,7 @@ static int map_load( const char *str, const char *name ) c ++; } - + // Update data texture to fill out the background { u8 info_buffer[64*64*4]; @@ -381,11 +489,58 @@ static int map_load( const char *str, const char *name ) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 64, 64, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer ); } + arrfree( links_to_make ); + map_reclassify( NULL, NULL, 1 ); + + // Validate links + for( int i = 0; i < world.h*world.w; i ++ ) + { + struct cell *src = &world.data[i]; + if( src->state & FLAG_IS_TRIGGER ) + { + int link_id = src->links[0]?0:1; + if( src->links[link_id] <= world.h*world.w ) + { + struct cell *target = &world.data[ src->links[link_id] ]; + if( (target->state & FLAG_CANAL) && (target->config == k_cell_type_split) ) + { + if( target->links[ link_id ] ) + { + vg_error( "Link target was already targeted\n" ); + goto IL_REG_ERROR; + } + else + { + // Valid link + target->links[ link_id ] = i; + target->state |= FLAG_TARGETED; + } + } + else + { + vg_error( "Link target was invalid\n" ); + goto IL_REG_ERROR; + } + } + else + { + vg_error( "Link target out of bounds\n" ); + goto IL_REG_ERROR; + } + } + } + vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h ); strncpy( world.map_name, name, vg_list_size( world.map_name )-1 ); + world.initialzed = 1; return 1; + +IL_REG_ERROR: + arrfree( links_to_make ); + map_free(); + return 0; } static struct cell *pcell( v2i pos ) @@ -404,7 +559,10 @@ static void map_serialize( FILE *stream ) if( cell->state & FLAG_WALL ) fputc( '#', stream ); else if( cell->state & FLAG_INPUT ) fputc( '+', stream ); else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream ); - else if( cell->state & FLAG_CANAL ) fputc( '*', stream ); + else if( cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1) ) + { + fputc( (cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1)) + (u32)'A', stream ); + } else fputc( ' ', stream ); } @@ -423,12 +581,33 @@ static void map_serialize( FILE *stream ) fputc( ',', stream ); terminal_write_count ++; - for( int j = 0; j < arrlen( term->conditions ); j ++ ) - fputc( term->conditions[j], stream ); + for( int j = 0; j < term->run_count; j ++ ) + { + struct terminal_run *run = &term->runs[j]; + + for( int k = 0; k < run->condition_count; k ++ ) + fputc( run->conditions[k], stream ); + + if( j < term->run_count-1 ) + fputc( ':', stream ); + } } } } + for( int x = 0; x < world.w; x ++ ) + { + struct cell *cell = pcell( (v2i){ x,y } ); + if( cell->state & FLAG_IS_TRIGGER ) + { + if( terminal_write_count ) + fputc( ',', stream ); + terminal_write_count ++; + + fprintf( stream, "%d", cell->links[0]? -cell->links[0]: cell->links[1] ); + } + } + fputc( '\n', stream ); } } @@ -440,6 +619,12 @@ int main( int argc, char *argv[] ) static int console_save_map( int argc, char const *argv[] ) { + if( !world.initialzed ) + { + vg_error( "Tried to save uninitialized map!\n" ); + return 0; + } + char map_path[ 256 ]; strcpy( map_path, "sav/" ); @@ -449,6 +634,7 @@ static int console_save_map( int argc, char const *argv[] ) FILE *test_writer = fopen( map_path, "wb" ); if( test_writer ) { + vg_info( "Saving map to '%s'\n", map_path ); map_serialize( test_writer ); fclose( test_writer ); @@ -485,8 +671,26 @@ static int console_load_map( int argc, char const *argv[] ) if( text_source ) { - map_load( text_source, argv[0] ); + vg_info( "Loading map: '%s'\n", map_path ); + world.ptr_career_level = NULL; + + if( !map_load( text_source, argv[0] ) ) + { + free( text_source ); + return 0; + } + free( text_source ); + + for( int i = 0; i < vg_list_size( level_pack_1 ); i ++ ) + { + if( !strcmp( level_pack_1[i], argv[0] ) ) + { + world.ptr_career_level = career.levels + i; + break; + } + } + return 1; } else @@ -502,6 +706,30 @@ static int console_load_map( int argc, char const *argv[] ) } } +static void io_reset(void) +{ + for( int i = 0; i < arrlen( world.io ); i ++ ) + { + struct cell_terminal *term = &world.io[i]; + + for( int j = 0; j < term->run_count; j ++ ) + term->runs[j].recv_count = 0; + } +} + +static void simulation_stop(void) +{ + world.simulating = 0; + world.num_fishes = 0; + world.sim_frame = 0; + + io_reset(); + + sfx_system_fadeout( &audio_system_balls_rolling, 44100 ); + + vg_info( "Stopping simulation!\n" ); +} + static int console_changelevel( int argc, char const *argv[] ) { if( argc >= 1 ) @@ -509,7 +737,10 @@ static int console_changelevel( int argc, char const *argv[] ) // Save current level if( console_save_map( 0, NULL ) ) if( console_load_map( argc, argv ) ) + { + simulation_stop(); return 1; + } } else { @@ -580,6 +811,19 @@ void vg_start(void) init_mesh( &world.circle, circle_mesh, vg_list_size( circle_mesh ) ); } + // Numbers mesh + { + init_mesh( &world.numbers, + MESH_NUMBERS_BUFFER, + vg_list_size( MESH_NUMBERS_BUFFER ) + ); + + for( int i = 0; i < 10; i ++ ) + { + vg_info( "offset: %u, length: %u\n", MESH_NUMBERS_OFFSETS[i][0], MESH_NUMBERS_OFFSETS[i][1] ); + } + } + // Create info data texture { glGenTextures( 1, &world.background_data ); @@ -605,12 +849,15 @@ void vg_start(void) resource_load_main(); + // Restore gamestate + career_load(); console_load_map( 1, level_pack_1 ); } void vg_free(void) { console_save_map( 0, NULL ); + career_serialize(); resource_free_main(); @@ -619,6 +866,7 @@ void vg_free(void) free_mesh( &world.tile ); free_mesh( &world.circle ); + free_mesh( &world.numbers ); map_free(); } @@ -790,27 +1038,6 @@ float const curve_7_linear_section = 0.1562f; void vg_update(void) { - static int curlevel = 0; - int changelvl = curlevel; - if( vg_get_button_down( "prev" ) ) { if( curlevel > 0 ) changelvl --; } - else if( vg_get_button_down( "next" ) ) { if( curlevel < vg_list_size( level_pack )-1 ) changelvl ++; } - - if( changelvl != curlevel ) - { - console_changelevel( 1, level_pack + changelvl ); - curlevel = changelvl; - - // TEMP!!! code dupe - world.simulating = 0; - world.num_fishes = 0; - world.sim_frame = 0; - - for( int i = 0; i < arrlen( world.io ); i ++ ) - world.io[i].recv_count = 0; - - vg_info( "Stopping simulation!\n" ); - } - // Fit within screen float r1 = (float)vg_window_y / (float)vg_window_x, @@ -836,46 +1063,144 @@ void vg_update(void) world.tile_x = floorf( world.tile_pos[0] ); world.tile_y = floorf( world.tile_pos[1] ); + static u16 id_drag_from = 0; + static v2f drag_from_co; + static v2f drag_to_co; + // Tilemap editing if( !world.simulating ) { + v2_copy( vg_mouse_ws, drag_to_co ); + if( cell_interactive( (v2i){ world.tile_x, world.tile_y } )) { world.selected = world.tile_y * world.w + world.tile_x; + static u32 modify_state = 0; + + struct cell *cell_ptr = &world.data[world.selected]; + if( vg_get_button_down("primary") ) { - world.data[ world.selected ].state ^= FLAG_CANAL; + modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL; + } + + if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) ) + { + cell_ptr->state &= ~FLAG_CANAL; + cell_ptr->state |= modify_state; - if( world.data[ world.selected ].state & FLAG_CANAL ) + if( cell_ptr->state & FLAG_CANAL ) + { sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 ); + world.score ++; + } else + { + if( cell_ptr->state & (FLAG_IS_TRIGGER|FLAG_TARGETED) ) + { + cell_ptr->state &= ~(FLAG_IS_TRIGGER|FLAG_TARGETED); + for( u32 i = 0; i < 2; i ++ ) + { + if( cell_ptr->links[i] ) + { + struct cell *other_ptr = &world.data[ cell_ptr->links[i] ]; + other_ptr->links[ i ] = 0; + other_ptr->state &= ~FLAG_IS_TRIGGER; + + if( other_ptr->links[ i ^ 0x1 ] == 0 ) + other_ptr->state &= ~(FLAG_TARGETED); + } + } + } + sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 ); + world.score --; + } + + cell_ptr->links[0] = 0; + cell_ptr->links[1] = 0; map_reclassify( (v2i){ world.tile_x -2, world.tile_y -2 }, (v2i){ world.tile_x +2, world.tile_y +2 }, 1 ); } + + if( vg_get_button_down("secondary") && !(cell_ptr->config == k_cell_type_split) ) + { + id_drag_from = world.selected; + drag_from_co[0] = world.tile_x + 0.5f; + drag_from_co[1] = world.tile_y + 0.5f; + } + + if( id_drag_from && (cell_ptr->config == k_cell_type_split) ) + { + float local_x = vg_mouse_ws[0] - (float)world.tile_x; + drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f); + drag_to_co[1] = (float)world.tile_y + 0.25f; + + if( vg_get_button_up("secondary") ) + { + struct cell *drag_ptr = &world.data[id_drag_from]; + u32 link_id = local_x > 0.5f? 1: 0; + + // Cleanup existing connections + if( cell_ptr->links[ link_id ] ) + { + vg_warn( "Destroying existing connection on link %u (%hu)\n", link_id, cell_ptr->links[ link_id ] ); + + struct cell *current_connection = &world.data[ cell_ptr->links[ link_id ]]; + current_connection->state &= ~FLAG_IS_TRIGGER; + current_connection->links[ link_id ] = 0; + } + + if( drag_ptr->links[ link_id ^ 0x1 ] ) + { + vg_warn( "Destroying alternate link %u (%hu)\n", link_id ^ 0x1, drag_ptr->links[ link_id ^ 0x1 ] ); + + struct cell *current_connection = &world.data[ drag_ptr->links[ link_id ^ 0x1 ]]; + if( !current_connection->links[ link_id ] ) + current_connection->state &= ~FLAG_TARGETED; + + current_connection->links[ link_id ^ 0x1 ] = 0; + drag_ptr->links[ link_id ^ 0x1 ] = 0; + } + + // Create the new connection + vg_success( "Creating connection on link %u (%hu)\n", link_id, id_drag_from ); + + cell_ptr->links[ link_id ] = id_drag_from; + drag_ptr->links[ link_id ] = world.selected; + + cell_ptr->state |= FLAG_TARGETED; + drag_ptr->state |= FLAG_IS_TRIGGER; + id_drag_from = 0; + } + } } else world.selected = -1; + + if( vg_get_button("secondary") && id_drag_from ) + { + vg_line2( drag_from_co, drag_to_co, 0xff00ff00, 0xffffff00 ); + } + else + { + id_drag_from = 0; + } + } + else + { + world.selected = -1; + id_drag_from = 0; } - else world.selected = -1; // Simulation stop/start if( vg_get_button_down("go") ) { if( world.simulating ) { - world.simulating = 0; - world.num_fishes = 0; - world.sim_frame = 0; - - for( int i = 0; i < arrlen( world.io ); i ++ ) - world.io[i].recv_count = 0; - - vg_info( "Stopping simulation!\n" ); - - sfx_system_fadeout( &audio_system_balls_rolling, 44100 ); + simulation_stop(); } else { @@ -887,14 +1212,12 @@ void vg_update(void) world.num_fishes = 0; world.sim_frame = 0; world.sim_start = vg_time; + world.sim_run = 0; for( int i = 0; i < world.w*world.h; i ++ ) - { world.data[ i ].state &= ~FLAG_FLIP_FLOP; - } - for( int i = 0; i < arrlen( world.io ); i ++ ) - world.io[i].recv_count = 0; + io_reset(); } } @@ -916,6 +1239,8 @@ void vg_update(void) } } + int alive_count = 0; + // Update fish positions for( int i = 0; i < world.num_fishes; i ++ ) { @@ -937,7 +1262,10 @@ void vg_update(void) if( term->id == fish->pos[1]*world.w + fish->pos[0] ) { - term->recv[ term->recv_count ++ ] = fish->payload; + struct terminal_run *run = &term->runs[ world.sim_run ]; + if( run->recv_count < vg_list_size( run->recieved ) ) + run->recieved[ run->recv_count ++ ] = fish->payload; + break; } } @@ -952,7 +1280,8 @@ void vg_update(void) fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1; fish->dir[1] = 0; - cell_current->state ^= FLAG_FLIP_FLOP; + if( !(cell_current->state & FLAG_TARGETED) ) + cell_current->state ^= FLAG_FLIP_FLOP; } else if( cell_current->config == k_cell_type_merge ) { @@ -967,7 +1296,7 @@ void vg_update(void) { // Try other directions for valid, so down, left, right.. v2i dirs[] = {{1,0},{-1,0},{0,-1}}; - vg_info( "Trying some other directions...\n" ); + //vg_info( "Trying some other directions...\n" ); for( int j = 0; j < vg_list_size(dirs); j ++ ) { @@ -1013,7 +1342,27 @@ void vg_update(void) sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 ); cell_entry->state |= FLAG_FLIP_ROTATING; } + + if( cell_entry->state & FLAG_IS_TRIGGER ) + { + int trigger_id = cell_entry->links[0]?0:1; + int connection_id = cell_entry->links[trigger_id]; + int target_px = connection_id % world.w; + int target_py = (connection_id - target_px)/world.w; + + vg_line2( (v2f){ fish->pos[0], fish->pos[1] }, (v2f){ target_px, target_py }, 0xffffffff, 0xffffffff ); + + struct cell *target_peice = &world.data[ cell_entry->links[trigger_id] ]; + + if( trigger_id ) + target_peice->state |= FLAG_FLIP_FLOP; + else + target_peice->state &= ~FLAG_FLIP_FLOP; + } } + + if( fish->alive ) + alive_count ++; } // Check for collisions @@ -1046,13 +1395,13 @@ void vg_update(void) if( is_input ) { - if( world.sim_frame < arrlen( term->conditions ) ) + if( world.sim_frame < term->runs[ world.sim_run ].condition_count ) { struct fish *fish = &world.fishes[world.num_fishes++]; fish->pos[0] = posx; fish->pos[1] = posy; fish->alive = 1; - fish->payload = term->conditions[world.sim_frame]; + fish->payload = term->runs[ world.sim_run ].conditions[ world.sim_frame ]; int can_spawn = 0; @@ -1068,10 +1417,84 @@ void vg_update(void) if( !can_spawn ) world.num_fishes--; + else + alive_count ++; } } } + if( alive_count == 0 ) + { + world.completed = 1; + + for( int i = 0; i < arrlen( world.io ); i ++ ) + { + struct cell_terminal *term = &world.io[ i ]; + int is_input = world.data[ term->id ].state & FLAG_INPUT; + + if( !is_input ) + { + struct terminal_run *run = &term->runs[ world.sim_run ]; + + if( run->recv_count == run->condition_count ) + { + for( int j = 0; j < run->condition_count; j ++ ) + { + if( run->recieved[j] != run->conditions[j] ) + { + world.completed = 0; + break; + } + } + } + else + { + world.completed = 0; + break; + } + } + } + + if( world.completed ) + { + if( world.sim_run < world.max_runs-1 ) + { + vg_success( "Run passed, starting next\n" ); + world.sim_run ++; + world.sim_frame = 0; + world.sim_start = vg_time; + continue; + } + else + { + vg_success( "Level passed!\n" ); + + u32 score = 0; + for( int i = 0; i < world.w*world.h; i ++ ) + if( world.data[ i ].state & FLAG_CANAL ) + score ++; + + world.score = score; + world.time = world.sim_frame; + } + } + else + { + vg_error( "Level failed :(\n" ); + } + + // Copy into career data + if( world.ptr_career_level ) + { + world.ptr_career_level->score = world.score; + world.ptr_career_level->time = world.time; + world.ptr_career_level->completed = world.completed; + } + + simulation_stop(); // TODO: Async? + break; + } + world.sim_frame ++; } @@ -1208,6 +1631,26 @@ static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f cons } } +static void draw_numbers( v3f coord, int number ) +{ + v3f pos; + v3_copy( coord, pos ); + int digits[8]; int i = 0; + + while( number > 0 && i < 8 ) + { + digits[i ++] = number % 10; + number = number / 10; + } + + for( int j = 0; j < i; j ++ ) + { + glUniform3fv( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 1, pos ); + draw_mesh( MESH_NUMBERS_OFFSETS[digits[i-j-1]][0], MESH_NUMBERS_OFFSETS[digits[i-j-1]][1] ); + pos[0] += pos[2] * 0.75f; + } +} + void vg_render(void) { glViewport( 0,0, vg_window_x, vg_window_y ); @@ -1317,40 +1760,80 @@ void vg_render(void) render_tiles( NULL, NULL, colour_default, colour_selected ); // Draw splitters - - for( int y = 0; y < world.h; y ++ ) + for( int y = 2; y < world.h-2; y ++ ) { - for( int x = 0; x < world.w; x ++ ) + for( int x = 2; x < world.w-2; x ++ ) { struct cell *cell = pcell((v2i){x,y}); - - if( cell->config == k_cell_type_split ) + + if( cell->state & FLAG_CANAL ) { - float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f ); - - if( cell->state & FLAG_FLIP_ROTATING ) + if( cell->state & FLAG_IS_TRIGGER ) { - if( (world.frame_lerp > curve_7_linear_section) ) + int trigger_id = cell->links[0]?0:1; + + int x2 = cell->links[trigger_id] % world.w; + int y2 = (cell->links[trigger_id] - x2) / world.w; + + v2f startpoint; + v2f midpoint; + v2f endpoint; + + startpoint[0] = (float)x2 + (trigger_id? 0.75f: 0.25f); + startpoint[1] = (float)y2 + 0.25f; + + endpoint[0] = x+0.5f; + endpoint[1] = y+0.5f; + v2_add( startpoint, endpoint, midpoint ); + v2_muls( midpoint, 0.5f, midpoint ); + midpoint[1] += -0.8f; + + float t, ta; + v2f lastpoint; v2f curpoint; + v2_copy( startpoint, lastpoint ); + + for( int i = 0; i < 10; i ++ ) { - float const rotation_speed = 0.4f; - if( (world.frame_lerp < 1.0f-rotation_speed) ) + t = ((float)i+1.f)/10.0f; + ta = 1.0f-t; + + v2_muls( startpoint, ta*ta, curpoint ); + v2_muladds( curpoint, midpoint, 2.0f*ta*t, curpoint ); + v2_muladds( curpoint, endpoint, t*t, curpoint ); + + vg_line2( lastpoint, curpoint, 0xff444444, 0xff444444 ); + v2_copy( curpoint, lastpoint ); + } + } + + if( cell->config == k_cell_type_split ) + { + float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f ); + + if( cell->state & FLAG_FLIP_ROTATING ) + { + if( (world.frame_lerp > curve_7_linear_section) ) { - float t = world.frame_lerp - curve_7_linear_section; - t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed))); - t += 1.0f; - - rotation *= t; + float const rotation_speed = 0.4f; + if( (world.frame_lerp < 1.0f-rotation_speed) ) + { + float t = world.frame_lerp - curve_7_linear_section; + t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed))); + t += 1.0f; + + rotation *= t; + } + else + rotation *= -1.0f; } - else - rotation *= -1.0f; } - } - m2x2_create_rotation( subtransform, rotation ); + m2x2_create_rotation( subtransform, rotation ); - glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform ); - glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, 0.0f, 0.0f ); - draw_mesh( 0, 2 ); + glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform ); + glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, cell->state & FLAG_TARGETED? 3.0f: 0.0f, 0.0f ); + draw_mesh( 0, 2 ); + } } } } @@ -1398,37 +1881,42 @@ void vg_render(void) v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; - for( int j = 0; j < arrlen( term->conditions ); j ++ ) + for( int k = 0; k < term->run_count; k ++ ) { - float y_offset = is_input? 1.2f: -0.2f; - glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, (float)posy + y_offset, 0.1f ); - - if( is_input ) + for( int j = 0; j < term->runs[k].condition_count; j ++ ) { - colour_code_v3( term->conditions[j], dot_colour ); - glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); - - // Draw filled if tick not passed, draw empty if empty - if( world.sim_frame > j ) - draw_mesh( empty_start, empty_count ); + float y_offset = is_input? 1.2f: -0.2f; + y_offset += (is_input? 0.2f: -0.2f) * (float)k; + + glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, (float)posy + y_offset, 0.1f ); + + if( is_input ) + { + colour_code_v3( term->runs[k].conditions[j], dot_colour ); + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); + + // Draw filled if tick not passed, draw empty if empty + if( world.sim_frame > j && world.sim_run >= k ) + draw_mesh( empty_start, empty_count ); + else + draw_mesh( filled_start, filled_count ); + } else - draw_mesh( filled_start, filled_count ); - } - else - { - if( term->recv_count > j ) { - colour_code_v3( term->recv[j], dot_colour ); - v3_muls( dot_colour, 0.8f, dot_colour ); + if( term->runs[k].recv_count > j ) + { + colour_code_v3( term->runs[k].recieved[j], dot_colour ); + v3_muls( dot_colour, 0.8f, dot_colour ); + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); + + draw_mesh( filled_start, filled_count ); + } + + colour_code_v3( term->runs[k].conditions[j], dot_colour ); glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); - draw_mesh( filled_start, filled_count ); + draw_mesh( empty_start, empty_count ); } - - colour_code_v3( term->conditions[j], dot_colour ); - glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); - - draw_mesh( empty_start, empty_count ); } } } @@ -1440,16 +1928,25 @@ void vg_render(void) draw_mesh( filled_start, filled_count ); } + // Draw score + float const score_bright = 1.25f; + glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), + 0.4f*score_bright, 0.39f*score_bright, 0.45f*score_bright, 1.0f ); + + use_mesh( &world.numbers ); + draw_numbers( (v3f){ 2.0f, (float)world.h-1.875f, 0.3333f }, world.score ); + // Level selection UI + use_mesh( &world.circle ); float ratio = ((float)vg_window_x/(float)vg_window_y); m3x3f ui_view = M3X3_IDENTITY; - m3x3_scale( ui_view, (v3f){ 1.0f, -ratio, 1.0f } ); + m3x3_scale( ui_view, (v3f){ 1.0f, ratio, 1.0f } ); glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)ui_view ); // Calculate mouse in UIsp v3f mouse_ui_space = { ((float)vg_mouse[0] / (float)(vg_window_x)) * 2.0f - 1.0f, - (((float)vg_mouse[1] / (float)(vg_window_y)) * 2.0f - 1.0f)*(1.0f/ratio), 0.0125f }; + (((float)vg_mouse[1] / (float)(vg_window_y)) * 2.0f - 1.0f)*(-1.0f/ratio), 0.0125f }; // Get selected level const float selection_scale = 0.05f; @@ -1459,8 +1956,8 @@ void vg_render(void) if( mouse_ui_space[0] <= -0.8f ) { float levels_range = (float)level_count*selection_scale*0.6f; - float level_offset = ((mouse_ui_space[1] + levels_range) / levels_range) * 0.5f * (float)level_count; - level_select = floorf( level_offset ); + float level_offset = ((-mouse_ui_space[1] + levels_range) / levels_range) * 0.5f * (float)level_count; + level_select = ceilf( level_offset ); // Draw selector if( level_select >= 0 && level_select < vg_list_size( level_pack_1 ) ) @@ -1470,7 +1967,7 @@ void vg_render(void) use_mesh( &world.tile ); glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), -1.0f, - (-(float)level_count + (float)level_select * 2.0f ) * selection_scale * 0.6f, + ((float)level_count - (float)level_select * 2.0f ) * selection_scale * 0.6f, selection_scale ); draw_mesh( 2, 2 ); @@ -1483,15 +1980,18 @@ void vg_render(void) } } } + else mouse_ui_space[1] = INFINITY; glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.4f, 0.39f, 0.45f, 1.0f ); // Draw levels for( int i = 0; i < level_count; i ++ ) { + struct career_level *clevel = &career.levels[i]; + v3f level_ui_space = { -0.97f, - (-(float)level_count + (float)i * 2.0f ) * selection_scale * 0.6f + selection_scale * 0.5f, + ((float)level_count - (float)i * 2.0f ) * selection_scale * 0.6f + selection_scale * 0.5f, selection_scale * 0.5f }; @@ -1499,11 +1999,33 @@ void vg_render(void) level_ui_space[2] *= scale; glUniform3fv( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 1, level_ui_space ); - draw_mesh( empty_start, empty_count ); + + if( clevel->completed ) + draw_mesh( filled_start, filled_count ); + else + draw_mesh( empty_start, empty_count ); + } + + // Level scores + use_mesh( &world.numbers ); + for( int i = 0; i < level_count; i ++ ) + { + struct career_level *clevel = &career.levels[i]; + + v3f level_ui_space = { + -0.94f, + ((float)level_count - (float)i * 2.0f ) * selection_scale * 0.6f + selection_scale * 0.5f, + 0.02f + }; + + if( clevel->completed ) + { + draw_numbers( level_ui_space, clevel->score ); + } } - glUniform3fv( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 1, mouse_ui_space ); - draw_mesh( empty_start, empty_count ); + //use_mesh( &world.numbers ); + //draw_numbers( (v3f){ 0.0f, -0.5f, 0.1f }, 128765 ); } void vg_ui(void)