X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=37d2469b2e7671cf14b490810abd28d259b52f05;hb=541e32d480cacbb6d4fdb9fa65b932d4cf322ddf;hp=6c5e9962bb79ef613170cc8159caa0e5099e58d5;hpb=8a39a1bbac29228f650cef6c1d36f618f1c3c000;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 6c5e996..37d2469 100644 --- a/fishladder.c +++ b/fishladder.c @@ -14,7 +14,8 @@ const char *level_pack_1[] = { "level6", "level7_combine", "xor_small", - "sort" + "sort", + "thirds" }; #pragma pack(push,1) @@ -97,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 @@ -461,6 +463,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 == '-' ) { @@ -641,7 +644,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[] ) @@ -782,6 +796,11 @@ void vg_start(void) .name = "map", .function = console_changelevel }); + + vg_function_push( (struct vg_cmd){ + .name = "credits", + .function = console_credits + }); // Quad mesh { @@ -1050,7 +1069,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; @@ -1082,6 +1101,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; + } } } @@ -1108,6 +1151,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 @@ -1135,10 +1182,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 ) { @@ -1164,35 +1207,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 ); } @@ -1252,14 +1278,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 { @@ -1309,6 +1329,8 @@ void vg_update(void) { cell->state &= ~FLAG_FLIP_ROTATING; } + if( cell->state & FLAG_IS_TRIGGER ) + cell->state &= ~FLAG_TRIGGERED; } int alive_count = 0; @@ -1317,7 +1339,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; @@ -1325,6 +1346,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 ) { @@ -1414,17 +1437,33 @@ 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] ]; + + cell_current->state |= FLAG_TRIGGERED; if( trigger_id ) target_peice->state |= FLAG_FLIP_FLOP; @@ -1432,12 +1471,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 ) @@ -1876,7 +1912,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 }; @@ -1904,9 +1940,19 @@ void vg_render(void) 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 ); - + + 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 ++ ) @@ -1931,6 +1977,7 @@ void vg_render(void) 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) ); @@ -1973,7 +2020,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 ); @@ -2084,6 +2131,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 ++ ) { @@ -2096,9 +2145,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 ); @@ -2107,5 +2158,5 @@ void vg_render(void) void vg_ui(void) { - //ui_test(); + ui_test(); }