X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=3a3d53c4f7dd8408e3d40780b97a90efd103a804;hb=7d8dae73edd0ecb6a1212046952740d43618dd81;hp=de9da68cac28ba2d7dc9acff593111af255e80ae;hpb=e750e1ea996212bec83072cab19cc21c358b4d89;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index de9da68..3a3d53c 100644 --- a/fishladder.c +++ b/fishladder.c @@ -10,7 +10,9 @@ const char *level_pack_1[] = { "level2", "level3", "level4", - "level5" + "level5", + "level6", + "level7_combine" }; #pragma pack(push,1) @@ -57,7 +59,7 @@ static void career_load(void) 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 ); + memcpy( (void*)career.levels, (void*)cr->levels, size_levels_input ); if( sz < sizeof( struct career_state ) ) { @@ -83,12 +85,18 @@ 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 @@ -178,32 +186,47 @@ 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; u32 sim_frame; float sim_start; int simulating; + u32 sim_run; 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, numbers; @@ -237,10 +260,7 @@ struct world } 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 ); @@ -292,9 +312,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 { @@ -305,6 +328,11 @@ 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 ++; + } else { vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h ); @@ -353,13 +381,28 @@ 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; world.score ++; } + 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; // Only canal supported currently + cell->links[0] = 0; // TODO: Link these somewhere else + cell->links[1] = 0; + world.score ++; + } else cell->state = 0x00; cx ++; @@ -407,7 +450,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 ); } @@ -426,8 +472,16 @@ 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 ); + } } } } @@ -488,7 +542,9 @@ static int console_load_map( int argc, char const *argv[] ) if( text_source ) { - map_load( text_source, argv[0] ); + if( !map_load( text_source, argv[0] ) ) + map_free(); + free( text_source ); // Update career link @@ -518,14 +574,24 @@ 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; - for( int i = 0; i < arrlen( world.io ); i ++ ) - world.io[i].recv_count = 0; + io_reset(); sfx_system_fadeout( &audio_system_balls_rolling, 44100 ); @@ -865,36 +931,137 @@ 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; - - if( 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( 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") ) @@ -915,12 +1082,9 @@ void vg_update(void) world.sim_start = vg_time; 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(); } } @@ -965,7 +1129,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; } } @@ -980,7 +1147,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 ) { @@ -1041,6 +1209,23 @@ 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 ) @@ -1077,13 +1262,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; @@ -1116,11 +1301,13 @@ void vg_update(void) if( !is_input ) { - if( term->recv_count == arrlen( term->conditions ) ) + struct terminal_run *run = &term->runs[ world.sim_run ]; + + if( run->recv_count == run->condition_count ) { - for( int j = 0; j < arrlen( term->conditions ); j ++ ) + for( int j = 0; j < run->condition_count; j ++ ) { - if( term->recv[j] != term->conditions[j] ) + if( run->recieved[j] != run->conditions[j] ) { world.completed = 0; break; @@ -1435,33 +1622,51 @@ void vg_render(void) { 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 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 ); + + if( cell->state & FLAG_FLIP_ROTATING ) { - float const rotation_speed = 0.4f; - if( (world.frame_lerp < 1.0f-rotation_speed) ) + 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 ); + } } } } @@ -1509,14 +1714,15 @@ void vg_render(void) v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; - for( int j = 0; j < arrlen( term->conditions ); j ++ ) + // TODO: Iterate runs + for( int j = 0; j < term->runs[0].condition_count; j ++ ) { 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 ) { - colour_code_v3( term->conditions[j], dot_colour ); + 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 @@ -1527,16 +1733,16 @@ void vg_render(void) } else { - if( term->recv_count > j ) + if( term->runs[0].recv_count > j ) { - colour_code_v3( term->recv[j], dot_colour ); + colour_code_v3( term->runs[0].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->conditions[j], dot_colour ); + 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 ); @@ -1629,6 +1835,24 @@ void vg_render(void) 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 ); + } + } + //use_mesh( &world.numbers ); //draw_numbers( (v3f){ 0.0f, -0.5f, 0.1f }, 128765 ); }