X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=8fccfb5d40583540c5e16d8e8ee57b0d18f6d898;hb=dfe098a9fda63d24cd83b95bed1630bb816f9846;hp=bcbc37428b6335433bd2ff7306feb337aeab982d;hpb=f98aae8c634505a899a2feaec34af873d90227cc;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index bcbc374..8fccfb5 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_TRIGGERED 0x200 +#define FLAG_FLIP_ROTATING 0x400 +#define FLAG_TARGETED 0x800 /* 0000 0 | 0001 1 | 0010 2 | 0011 3 @@ -122,7 +126,11 @@ enum cell_type k_cell_type_ramp_right = 3, k_cell_type_ramp_left = 6, k_cell_type_split = 7, - k_cell_type_merge = 13 + k_cell_type_merge = 13, + k_cell_type_con_r = 1, + k_cell_type_con_u = 2, + k_cell_type_con_l = 4, + k_cell_type_con_d = 8 }; v3f colour_sets[] = @@ -184,6 +192,14 @@ static void use_mesh( struct mesh *m ) glBindVertexArray( m->vao ); } +enum e_fish_state +{ + k_fish_state_soon_dead = -1, + k_fish_state_dead = 0, + k_fish_state_alive, + k_fish_state_bg +}; + struct world { #pragma pack(push,1) @@ -231,6 +247,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; @@ -242,7 +264,7 @@ struct world { v2i pos; v2i dir; - int alive; + enum e_fish_state state; char payload; float death_time; v2f physics_v; @@ -277,6 +299,17 @@ static void map_free(void) 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 ) { @@ -313,15 +346,21 @@ static int map_load( const char *str, const char *name ) 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 ]; @@ -436,6 +475,7 @@ static int map_load( const char *str, const char *name ) // Tile initialization // row[ cx ] .. etc struct cell *cell = &row[ cx ]; + cell->config = 0xF; if( *c == '+' || *c == '-' ) { @@ -533,6 +573,8 @@ static int map_load( const char *str, const char *name ) 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; @@ -614,7 +656,18 @@ static void map_serialize( FILE *stream ) int main( int argc, char *argv[] ) { - vg_init( argc, argv, "Fish (Marbles Computer) Ladder Simulator 2022 | N,M: change level | SPACE: Test | LeftClick: Toggle tile" ); + vg_init( argc, argv, "Marble Computing | SPACE: Test | LeftClick: Toggle tile | RightClick: Drag wire" ); +} + +static int console_credits( int argc, char const *argv[] ) +{ + vg_info( "Aknowledgements:\n" ); + vg_info( " GLFW zlib/libpng glfw.org\n" ); + vg_info( " miniaudio MIT0 miniaud.io\n" ); + vg_info( " QOI MIT phoboslab.org\n" ); + vg_info( " STB library MIT nothings.org\n" ); + vg_info( " Weiholmir font justfredrik.itch.io\n" ); + return 0; } static int console_save_map( int argc, char const *argv[] ) @@ -706,17 +759,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; @@ -735,12 +777,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 { @@ -753,19 +795,24 @@ 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 }); + + vg_function_push( (struct vg_cmd){ + .name = "credits", + .function = console_credits + }); // Quad mesh { @@ -824,6 +871,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 ); @@ -864,6 +960,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 ); @@ -871,10 +971,15 @@ void vg_free(void) map_free(); } +static int world_check_pos_ok( v2i co ) +{ + return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1; +} + static int cell_interactive( v2i co ) { // Bounds check - if( co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2 ) + if( !world_check_pos_ok( co ) ) return 0; // Flags check @@ -981,7 +1086,7 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) for( int x = px0; x < px1; x ++ ) { struct cell *cell = pcell((v2i){x,y}); - + v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}}; u8 height = 0; @@ -1013,6 +1118,30 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) info_px[1] = cell->state & FLAG_WALL? 0: 255; info_px[2] = 0; info_px[3] = 0; + + if( + ( + ((cell->state & FLAG_IS_TRIGGER) && (cell->config == 0xF || cell->config == k_cell_type_split)) || + ((cell->state & FLAG_TARGETED) && (cell->config != k_cell_type_split)) + ) && update_texbuffer + ){ + cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER); + for( u32 i = 0; i < 2; i ++ ) + { + if( cell->links[i] ) + { + struct cell *other_ptr = &world.data[ cell->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; + } + } + + cell->links[0] = 0; + cell->links[1] = 0; + } } } @@ -1023,11 +1152,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}}; @@ -1036,6 +1168,10 @@ v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f}, float const curve_7_linear_section = 0.1562f; +u16 id_drag_from = 0; +v2f drag_from_co; +v2f drag_to_co; + void vg_update(void) { // Fit within screen @@ -1063,10 +1199,6 @@ 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 ) { @@ -1092,35 +1224,18 @@ void vg_update(void) if( cell_ptr->state & FLAG_CANAL ) { + cell_ptr->links[0] = 0; + cell_ptr->links[1] = 0; + 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 ); } @@ -1180,14 +1295,8 @@ void vg_update(void) else world.selected = -1; - if( vg_get_button("secondary") && id_drag_from ) - { - vg_line2( drag_from_co, drag_to_co, 0xff00ff00, 0xffffff00 ); - } - else - { + if( !(vg_get_button("secondary") && id_drag_from) ) id_drag_from = 0; - } } else { @@ -1237,6 +1346,8 @@ void vg_update(void) { cell->state &= ~FLAG_FLIP_ROTATING; } + if( cell->state & FLAG_IS_TRIGGER ) + cell->state &= ~FLAG_TRIGGERED; } int alive_count = 0; @@ -1245,114 +1356,174 @@ 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; + if( fish->state == k_fish_state_soon_dead ) + fish->state = k_fish_state_dead; - if( fish->alive != 1 ) + if( fish->state < k_fish_state_alive ) continue; - // Apply to output - if( cell_current->state & FLAG_OUTPUT ) + struct cell *cell_current = pcell( fish->pos ); + + if( fish->state == k_fish_state_alive ) { - for( int j = 0; j < arrlen( world.io ); j ++ ) + // Apply to output + if( cell_current->state & FLAG_OUTPUT ) { - struct cell_terminal *term = &world.io[j]; + for( int j = 0; j < arrlen( world.io ); j ++ ) + { + struct cell_terminal *term = &world.io[j]; + + if( term->id == fish->pos[1]*world.w + fish->pos[0] ) + { + 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; + } + } + + fish->state = k_fish_state_dead; + continue; + } + + if( cell_current->config == k_cell_type_split ) + { + // Flip flop L/R + fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1; + fish->dir[1] = 0; - if( term->id == fish->pos[1]*world.w + fish->pos[0] ) + if( !(cell_current->state & FLAG_TARGETED) ) + cell_current->state ^= FLAG_FLIP_FLOP; + } + else if( cell_current->config == k_cell_type_merge ) + { + // Can only move up + fish->dir[0] = 0; + fish->dir[1] = -1; + } + else + { + struct cell *cell_next = pcell( (v2i){ fish->pos[0]+fish->dir[0], fish->pos[1]+fish->dir[1] } ); + if( !(cell_next->state & (FLAG_CANAL|FLAG_OUTPUT)) ) { - 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; + // Try other directions for valid, so down, left, right.. + v2i dirs[] = {{1,0},{-1,0},{0,-1}}; + //vg_info( "Trying some other directions...\n" ); - break; + for( int j = 0; j < vg_list_size(dirs); j ++ ) + { + if( (dirs[j][0] == -fish->dir[0]) && (dirs[j][1] == -fish->dir[1]) ) + continue; + + if( pcell( (v2i){ fish->pos[0]+dirs[j][0], fish->pos[1]+dirs[j][1] } )->state & (FLAG_CANAL|FLAG_OUTPUT) ) + { + fish->dir[0] = dirs[j][0]; + fish->dir[1] = dirs[j][1]; + } + } } } - fish->alive = 0; - continue; - } - - if( cell_current->config == k_cell_type_split ) - { - // Flip flop L/R - fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1; - fish->dir[1] = 0; + fish->pos[0] += fish->dir[0]; + fish->pos[1] += fish->dir[1]; - if( !(cell_current->state & FLAG_TARGETED) ) - cell_current->state ^= FLAG_FLIP_FLOP; - } - else if( cell_current->config == k_cell_type_merge ) - { - // Can only move up - fish->dir[0] = 0; - fish->dir[1] = -1; + struct cell *cell_entry = pcell( fish->pos ); + + if( !(cell_entry->state & (FLAG_INPUT|FLAG_CANAL|FLAG_OUTPUT) )) + { + if( world_check_pos_ok( fish->pos ) ) + fish->state = k_fish_state_bg; + else + fish->state = k_fish_state_dead; + } + else + { + if( fish->dir[0] ) + { + if( cell_entry->config == k_cell_type_split || + cell_entry->config == k_cell_type_ramp_right || + cell_entry->config == k_cell_type_ramp_left ) + { + // Special death (FALL) + /* + v2_sub( fish->physics_co, fish->physics_v, fish->physics_v ); + v2_divs( fish->physics_v, vg_time_delta, fish->physics_v ); + */ + + fish->state = k_fish_state_dead; + vg_error( "REMOVE THIS CONDITION\n" ); + continue; + } + } + + if( cell_entry->config == k_cell_type_split ) + { + sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 ); + cell_entry->state |= FLAG_FLIP_ROTATING; + } + } } - else + else if( fish->state == k_fish_state_bg ) { - struct cell *cell_next = pcell( (v2i){ fish->pos[0]+fish->dir[0], fish->pos[1]+fish->dir[1] } ); - if( !(cell_next->state & (FLAG_CANAL|FLAG_OUTPUT)) ) + fish->pos[0] += fish->dir[0]; + fish->pos[1] += fish->dir[1]; + + if( !world_check_pos_ok( fish->pos ) ) + fish->state = k_fish_state_dead; + else { - // Try other directions for valid, so down, left, right.. - v2i dirs[] = {{1,0},{-1,0},{0,-1}}; - //vg_info( "Trying some other directions...\n" ); + struct cell *cell_entry = pcell( fish->pos ); - for( int j = 0; j < vg_list_size(dirs); j ++ ) + if( cell_entry->state & FLAG_CANAL ) { - if( (dirs[j][0] == -fish->dir[0]) && (dirs[j][1] == -fish->dir[1]) ) - continue; - - if( pcell( (v2i){ fish->pos[0]+dirs[j][0], fish->pos[1]+dirs[j][1] } )->state & (FLAG_CANAL|FLAG_OUTPUT) ) + if( cell_entry->config == k_cell_type_con_r || cell_entry->config == k_cell_type_con_u + || cell_entry->config == k_cell_type_con_l || cell_entry->config == k_cell_type_con_d ) { - fish->dir[0] = dirs[j][0]; - fish->dir[1] = dirs[j][1]; + fish->state = k_fish_state_alive; + + fish->dir[0] = 0; + fish->dir[1] = 0; + + switch( cell_entry->config ) + { + case k_cell_type_con_r: fish->dir[0] = 1; break; + case k_cell_type_con_l: fish->dir[0] = -1; break; + case k_cell_type_con_u: fish->dir[1] = 1; break; + case k_cell_type_con_d: fish->dir[1] = -1; break; + } } } } } + else { vg_error( "fish behaviour unimplemented for behaviour type (%d)\n" ); } - fish->pos[0] += fish->dir[0]; - fish->pos[1] += fish->dir[1]; - - struct cell *cell_entry = pcell( fish->pos ); + if( fish->state >= k_fish_state_alive ) + alive_count ++; + } + + // Second pass (triggers) + for( int i = 0; i < world.num_fishes; i ++ ) + { + struct fish *fish = &world.fishes[i]; - if( !(cell_entry->state & (FLAG_INPUT|FLAG_CANAL|FLAG_OUTPUT) )) - fish->alive = 0; - else + if( fish->state == k_fish_state_alive ) { - if( fish->dir[0] ) - { - if( cell_entry->config == k_cell_type_split || - cell_entry->config == k_cell_type_ramp_right || - cell_entry->config == k_cell_type_ramp_left ) - { - // Special death (FALL) - v2_sub( fish->physics_co, fish->physics_v, fish->physics_v ); - v2_divs( fish->physics_v, vg_time_delta, fish->physics_v ); + struct cell *cell_current = pcell( fish->pos ); - fish->alive = -2; - vg_warn( "Special death (fall)\n" ); - continue; - } - } - - if( cell_entry->config == k_cell_type_split ) - { - 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( 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] ]; + + cell_current->state |= FLAG_TRIGGERED; if( trigger_id ) target_peice->state |= FLAG_FLIP_FLOP; @@ -1360,24 +1531,22 @@ 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 ) + if( world.fishes[i].state == k_fish_state_alive ) { for( int j = i+1; j < world.num_fishes; j ++ ) { - if( (world.fishes[j].alive == 1) && (world.fishes[i].pos[0] == world.fishes[j].pos[0]) && + if( (world.fishes[j].state == k_fish_state_alive) && + (world.fishes[i].pos[0] == world.fishes[j].pos[0]) && (world.fishes[i].pos[1] == world.fishes[j].pos[1]) ) { // Shatter death (+0.5s) - world.fishes[i].alive = -1; - world.fishes[j].alive = -1; + world.fishes[i].state = k_fish_state_soon_dead; + world.fishes[j].state = k_fish_state_soon_dead; world.fishes[i].death_time = 0.5f; world.fishes[j].death_time = 0.5f; } @@ -1400,7 +1569,7 @@ void vg_update(void) struct fish *fish = &world.fishes[world.num_fishes++]; fish->pos[0] = posx; fish->pos[1] = posy; - fish->alive = 1; + fish->state = k_fish_state_alive; fish->payload = term->runs[ world.sim_run ].conditions[ world.sim_frame ]; int can_spawn = 0; @@ -1463,6 +1632,7 @@ void vg_update(void) world.sim_run ++; world.sim_frame = 0; world.sim_start = vg_time; + world.num_fishes = 0; continue; } else @@ -1507,76 +1677,79 @@ void vg_update(void) { struct fish *fish = &world.fishes[i]; - if( fish->alive == 0 ) + if( fish->state == k_fish_state_dead ) continue; - if( fish->alive == -1 && (world.frame_lerp > fish->death_time) ) + if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) ) continue; // Todo: particle thing? + + struct cell *cell = pcell(fish->pos); + v2f const *curve; + + float t = world.frame_lerp; + float ti = 1.0f-t; - if( fish->alive == -2 ) + v2_copy( fish->physics_co, fish->physics_v ); + + switch( cell->config ) { - v2_muladds( fish->physics_v, (v2f){ 0.0, -9.8f }, vg_time_delta, fish->physics_v ); - v2_muladds( fish->physics_co, fish->physics_v, vg_time_delta, fish->physics_co ); + case 13: + if( fish->dir[0] == 1 ) + curve = curve_12; + else + curve = curve_9; + break; + case k_cell_type_con_r: curve = curve_1; + if( fish->dir[0] == 1 ) t = ti; + break; + case k_cell_type_con_l: curve = curve_4; + if( fish->dir[0] == -1 ) t = ti; + break; + case k_cell_type_con_u: curve = curve_2; + if( fish->dir[1] == 1 ) t = ti; + break; + case k_cell_type_con_d: curve = curve_8; + if( fish->dir[1] == 1 ) t = ti; + break; + case 3: curve = curve_3; break; + case 6: curve = curve_6; break; + case 9: curve = curve_9; break; + case 12: curve = curve_12; break; + case 7: + if( t > curve_7_linear_section ) + { + t -= curve_7_linear_section; + t *= (1.0f/(1.0f-curve_7_linear_section)); + + curve = cell->state & FLAG_FLIP_FLOP? curve_7: curve_7_1; + } + else curve = NULL; + break; + default: curve = NULL; break; } - else - { - struct cell *cell = pcell(fish->pos); - v2f const *curve; - - float t = world.frame_lerp; - - v2_copy( fish->physics_co, fish->physics_v ); - - switch( cell->config ) - { - case 13: - if( fish->dir[0] == 1 ) - curve = curve_12; - else - curve = curve_9; - break; - case 2: curve = curve_2; break; - case 8: curve = curve_8; break; - case 3: curve = curve_3; break; - case 6: curve = curve_6; break; - case 9: curve = curve_9; break; - case 12: curve = curve_12; break; - case 7: - if( t > curve_7_linear_section ) - { - t -= curve_7_linear_section; - t *= (1.0f/(1.0f-curve_7_linear_section)); - - curve = cell->state & FLAG_FLIP_FLOP? curve_7: curve_7_1; - } - else curve = NULL; - break; - default: curve = NULL; break; - } - if( curve ) - { - float t2 = t * t; - float t3 = t * t * t; + if( curve ) + { + float t2 = t * t; + float t3 = t * t * t; - float cA = 3.0f*t2 - 3.0f*t3; - float cB = 3.0f*t3 - 6.0f*t2 + 3.0f*t; - float cC = 3.0f*t2 - t3 - 3.0f*t + 1.0f; + float cA = 3.0f*t2 - 3.0f*t3; + float cB = 3.0f*t3 - 6.0f*t2 + 3.0f*t; + float cC = 3.0f*t2 - t3 - 3.0f*t + 1.0f; - fish->physics_co[0] = t3*curve[3][0] + cA*curve[2][0] + cB*curve[1][0] + cC*curve[0][0]; - fish->physics_co[1] = t3*curve[3][1] + cA*curve[2][1] + cB*curve[1][1] + cC*curve[0][1]; - fish->physics_co[0] += (float)fish->pos[0]; - fish->physics_co[1] += (float)fish->pos[1]; - } - else - { - v2f origin; - origin[0] = (float)fish->pos[0] + (float)fish->dir[0]*-0.5f + 0.5f; - origin[1] = (float)fish->pos[1] + (float)fish->dir[1]*-0.5f + 0.5f; - - fish->physics_co[0] = origin[0] + (float)fish->dir[0]*t; - fish->physics_co[1] = origin[1] + (float)fish->dir[1]*t; - } + fish->physics_co[0] = t3*curve[3][0] + cA*curve[2][0] + cB*curve[1][0] + cC*curve[0][0]; + fish->physics_co[1] = t3*curve[3][1] + cA*curve[2][1] + cB*curve[1][1] + cC*curve[0][1]; + fish->physics_co[0] += (float)fish->pos[0]; + fish->physics_co[1] += (float)fish->pos[1]; + } + else + { + v2f origin; + origin[0] = (float)fish->pos[0] + (float)fish->dir[0]*-0.5f + 0.5f; + origin[1] = (float)fish->pos[1] + (float)fish->dir[1]*-0.5f + 0.5f; + + fish->physics_co[0] = origin[0] + (float)fish->dir[0]*t; + fish->physics_co[1] = origin[1] + (float)fish->dir[1]*t; } } } @@ -1732,10 +1905,10 @@ void vg_render(void) { struct fish *fish = &world.fishes[i]; - if( fish->alive == 0 ) + if( fish->state == k_fish_state_dead || fish->state == k_fish_state_bg ) continue; - if( fish->alive == -1 && (world.frame_lerp > fish->death_time) ) + if( fish->state == k_fish_state_soon_dead && (world.frame_lerp > fish->death_time) ) continue; v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; @@ -1768,44 +1941,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 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 ++ ) - { - 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 ); @@ -1839,7 +1974,7 @@ void vg_render(void) } // Edit overlay - if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) ) + if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) && !id_drag_from ) { v2i new_begin = { world.tile_x - 2, world.tile_y - 2 }; v2i new_end = { world.tile_x + 2, world.tile_y + 2 }; @@ -1860,8 +1995,59 @@ 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 ); + glUniform4f( SHADER_UNIFORM( shader_wire, "uColour" ), 0.2f, 0.2f, 0.2f, 1.0f ); + + if( id_drag_from ) + { + glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), drag_from_co[0], drag_from_co[1], 0.06f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), drag_to_co[0], drag_to_co[1], 0.06f ); + glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); + } + + float rp_x1 = world.frame_lerp*9.0f; + float rp_x2 = 1.0f-rp_x1*expf(1.0f-rp_x1)* 0.36f; + + 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; + + glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f ); + 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 ); @@ -1896,7 +2082,7 @@ void vg_render(void) 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 ) + if( (world.sim_frame > j && world.sim_run >= k) || world.sim_run > k ) draw_mesh( empty_start, empty_count ); else draw_mesh( filled_start, filled_count ); @@ -2007,6 +2193,8 @@ void vg_render(void) } // Level scores + glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.4f*1.25f, 0.39f*1.25f, 0.45f*1.25f, 1.0f ); + use_mesh( &world.numbers ); for( int i = 0; i < level_count; i ++ ) { @@ -2019,9 +2207,11 @@ void vg_render(void) }; if( clevel->completed ) - { draw_numbers( level_ui_space, clevel->score ); - } + + level_ui_space[0] = -0.975f; + level_ui_space[1] -= 0.01f; + draw_numbers( level_ui_space, i ); } //use_mesh( &world.numbers ); @@ -2030,5 +2220,5 @@ void vg_render(void) void vg_ui(void) { - //ui_test(); + ui_test(); }