X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=f310bd53ff798ad3f00e018b7a60158163ba610b;hb=edd5498fac470c6a98e45ab326c2bf2e2a552664;hp=3a3d53c4f7dd8408e3d40780b97a90efd103a804;hpb=7d8dae73edd0ecb6a1212046952740d43618dd81;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 3a3d53c..f310bd5 100644 --- a/fishladder.c +++ b/fishladder.c @@ -12,7 +12,10 @@ const char *level_pack_1[] = { "level4", "level5", "level6", - "level7_combine" + "level7_combine", + "xor_small", + "sort", + "thirds" }; #pragma pack(push,1) @@ -95,8 +98,9 @@ m3x3f m_mdl; #define FLAG_WALL 0x40 #define FLAG_FLIP_FLOP 0x100 -#define FLAG_FLIP_ROTATING 0x200 -#define FLAG_TARGETED 0x400 +#define FLAG_TRIGGER_FLIP 0x200 +#define FLAG_FLIP_ROTATING 0x400 +#define FLAG_TARGETED 0x800 /* 0000 0 | 0001 1 | 0010 2 | 0011 3 @@ -197,12 +201,14 @@ struct world *data; #pragma pack(pop) - u32 frame; + int frame; - u32 sim_frame; + int initialzed; + + int sim_frame; float sim_start; int simulating; - u32 sim_run; + int sim_run, max_runs; float frame_lerp; @@ -229,6 +235,12 @@ struct world int w, h; struct mesh tile, circle, numbers; + struct mesh_wire + { + GLuint vao, vbo, ebo; + u32 em; + } + wire; GLuint background_data; GLuint random_samples; @@ -271,11 +283,26 @@ static void map_free(void) world.score = 0; world.time = 0; world.completed = 0; + world.max_runs = 0; + world.initialzed = 0; +} + +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 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; @@ -296,20 +323,32 @@ 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 ) break; + if( *c == '\r' ) { c ++; continue; } // fuck off windows + if( *c == ';' ) { c ++; - + + if( *c == '\r' ) c ++; + // Parse attribs if( *c != '\n' ) { while( *c ) { + if( *c == '\r' ) { c ++; continue; } + if( reg_start < reg_end ) { struct cell_terminal *terminal = &world.io[ reg_start ]; @@ -332,47 +371,93 @@ static int map_load( const char *str, const char *name ) { 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 @@ -398,8 +483,12 @@ static int map_load( const char *str, const char *name ) // 2: Reserved // 3: Reserved - cell->state = ((u32)*c - (u32)'A') & FLAG_CANAL; // Only canal supported currently - cell->links[0] = 0; // TODO: Link these somewhere else + 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 ++; } @@ -410,7 +499,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]; @@ -427,11 +516,60 @@ 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 ); + io_reset(); + 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 ) @@ -486,6 +624,19 @@ static void map_serialize( FILE *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 ); } } @@ -497,6 +648,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/" ); @@ -506,6 +663,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 ); @@ -542,14 +700,17 @@ static int console_load_map( int argc, char const *argv[] ) if( text_source ) { + vg_info( "Loading map: '%s'\n", map_path ); + world.ptr_career_level = NULL; + if( !map_load( text_source, argv[0] ) ) - map_free(); + { + free( text_source ); + return 0; + } free( text_source ); - // Update career link - world.ptr_career_level = NULL; - for( int i = 0; i < vg_list_size( level_pack_1 ); i ++ ) { if( !strcmp( level_pack_1[i], argv[0] ) ) @@ -574,17 +735,6 @@ 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; @@ -603,12 +753,12 @@ static int console_changelevel( int argc, char const *argv[] ) if( argc >= 1 ) { // Save current level - if( console_save_map( 0, NULL ) ) - if( console_load_map( argc, argv ) ) - { - simulation_stop(); - return 1; - } + console_save_map( 0, NULL ); + if( console_load_map( argc, argv ) ) + { + simulation_stop(); + return 1; + } } else { @@ -621,17 +771,17 @@ static int console_changelevel( int argc, char const *argv[] ) void vg_start(void) { vg_function_push( (struct vg_cmd){ - .name = "map_write", + .name = "_map_write", .function = console_save_map }); vg_function_push( (struct vg_cmd){ - .name = "map_load", + .name = "_map_load", .function = console_load_map }); vg_function_push( (struct vg_cmd){ - .name = "changelevel", + .name = "map", .function = console_changelevel }); @@ -692,6 +842,55 @@ void vg_start(void) } } + // Create wire mesh + { + int const num_segments = 64; + + struct mesh_wire *mw = &world.wire; + + v2f wire_points[ num_segments * 2 ]; + u16 wire_indices[ 6*(num_segments-1) ]; + + for( int i = 0; i < num_segments; i ++ ) + { + float l = (float)i / (float)(num_segments-1); + + v2_copy( (v2f){ l, -0.5f }, wire_points[i*2+0] ); + v2_copy( (v2f){ l, 0.5f }, wire_points[i*2+1] ); + + if( i < num_segments-1 ) + { + wire_indices[ i*6+0 ] = i*2 + 0; + wire_indices[ i*6+1 ] = i*2 + 1; + wire_indices[ i*6+2 ] = i*2 + 3; + wire_indices[ i*6+3 ] = i*2 + 0; + wire_indices[ i*6+4 ] = i*2 + 3; + wire_indices[ i*6+5 ] = i*2 + 2; + } + } + + glGenVertexArrays( 1, &mw->vao ); + glGenBuffers( 1, &mw->vbo ); + glGenBuffers( 1, &mw->ebo ); + glBindVertexArray( mw->vao ); + + glBindBuffer( GL_ARRAY_BUFFER, mw->vbo ); + + glBufferData( GL_ARRAY_BUFFER, sizeof( wire_points ), wire_points, GL_STATIC_DRAW ); + glBindVertexArray( mw->vao ); + + glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, mw->ebo ); + glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof( wire_indices ), wire_indices, GL_STATIC_DRAW ); + + // XY + glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 ); + glEnableVertexAttribArray( 0 ); + + VG_CHECK_GL(); + + mw->em = vg_list_size( wire_indices ); + } + // Create info data texture { glGenTextures( 1, &world.background_data ); @@ -732,6 +931,10 @@ void vg_free(void) glDeleteTextures( 1, &world.background_data ); glDeleteTextures( 1, &world.random_samples ); + glDeleteVertexArrays( 1, &world.wire.vao ); + glDeleteBuffers( 1, &world.wire.vbo ); + glDeleteBuffers( 1, &world.wire.ebo ); + free_mesh( &world.tile ); free_mesh( &world.circle ); free_mesh( &world.numbers ); @@ -891,11 +1094,14 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) } } + v2f const curve_3[] = {{0.5f,1.0f},{0.5f,0.625f},{0.625f,0.5f},{1.0f,0.5f}}; v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}}; v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}}; v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}}; +v2f const curve_1[] = {{1.0f,0.5f},{0.8f,0.5f},{0.3f,0.5f},{0.2f,0.5f}}; +v2f const curve_4[] = {{0.0f,0.5f},{0.3f,0.5f},{0.5f,0.5f},{0.8f,0.5f}}; v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}}; v2f const curve_8[] = {{0.5f,0.8f},{0.5f,0.5f},{0.5f,0.3f},{0.5f,0.0f}}; @@ -1080,6 +1286,7 @@ 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; @@ -1112,7 +1319,6 @@ void vg_update(void) for( int i = 0; i < world.num_fishes; i ++ ) { struct fish *fish = &world.fishes[i]; - struct cell *cell_current = pcell( fish->pos ); if( fish->alive == -1 ) fish->alive = 0; @@ -1120,6 +1326,8 @@ void vg_update(void) if( fish->alive != 1 ) continue; + struct cell *cell_current = pcell( fish->pos ); + // Apply to output if( cell_current->state & FLAG_OUTPUT ) { @@ -1163,7 +1371,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 ++ ) { @@ -1209,17 +1417,31 @@ 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 ) + } + + if( fish->alive ) + alive_count ++; + } + + // Second pass (triggers) + for( int i = 0; i < world.num_fishes; i ++ ) + { + struct fish *fish = &world.fishes[i]; + + if( fish->alive == 1 ) + { + struct cell *cell_current = pcell( fish->pos ); + + if( cell_current->state & FLAG_IS_TRIGGER ) { - int trigger_id = cell_entry->links[0]?0:1; - int connection_id = cell_entry->links[trigger_id]; + int trigger_id = cell_current->links[0]?0:1; + int connection_id = cell_current->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] ]; + struct cell *target_peice = &world.data[ cell_current->links[trigger_id] ]; if( trigger_id ) target_peice->state |= FLAG_FLIP_FLOP; @@ -1227,12 +1449,9 @@ void vg_update(void) target_peice->state &= ~FLAG_FLIP_FLOP; } } - - if( fish->alive ) - alive_count ++; } - // Check for collisions + // Third pass (collisions) for( int i = 0; i < world.num_fishes; i ++ ) { if( world.fishes[i].alive == 1 ) @@ -1324,15 +1543,27 @@ void vg_update(void) if( world.completed ) { - 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; + 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; + world.num_fishes = 0; + 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 { @@ -1391,6 +1622,8 @@ void vg_update(void) else curve = curve_9; break; + case 1: curve = curve_1; break; + case 4: curve = curve_4; break; case 2: curve = curve_2; break; case 8: curve = curve_8; break; case 3: curve = curve_3; break; @@ -1624,21 +1857,6 @@ void vg_render(void) if( cell->state & FLAG_CANAL ) { - if( cell->state & FLAG_IS_TRIGGER ) - { - 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 drag_to_co; - - drag_to_co[0] = (float)x2 + (trigger_id? 0.75f: 0.25f); - drag_to_co[1] = (float)y2 + 0.25f; - - vg_line2( (v2f){x+0.5f,y+0.5f}, drag_to_co, 0xff0000ff, 0xff00ffff ); - } - if( cell->config == k_cell_type_split ) { float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f ); @@ -1693,8 +1911,48 @@ void vg_render(void) //glDisable(GL_BLEND); + // Draw connecting wires glDisable(GL_BLEND); + SHADER_USE( shader_wire ); + glBindVertexArray( world.wire.vao ); + + glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); + glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f ); + glUniform4f( SHADER_UNIFORM( shader_wire, "uColour" ), 0.2f, 0.2f, 0.2f, 1.0f ); + + for( int y = 2; y < world.h-2; y ++ ) + { + for( int x = 2; x < world.w-2; x ++ ) + { + struct cell *cell = pcell((v2i){x,y}); + + if( cell->state & FLAG_CANAL ) + { + if( cell->state & FLAG_IS_TRIGGER ) + { + 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 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; + + glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.04f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.04f ); + glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); + } + } + } + } + SHADER_USE( shader_tile_colour ); glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); use_mesh( &world.circle ); @@ -1714,38 +1972,42 @@ void vg_render(void) v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; - // TODO: Iterate runs - for( int j = 0; j < term->runs[0].condition_count; 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->runs[0].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->runs[0].recv_count > j ) { - colour_code_v3( term->runs[0].recieved[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->runs[0].conditions[j], dot_colour ); - glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); - - draw_mesh( empty_start, empty_count ); } } }