X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=2a2da7520751101d4ff725de383d1bdd0817622a;hb=ec1dd5de4848534241c8bea3841ef36fe047915b;hp=9a567df86c7874e6f65b3cc3a6228a33a1e8ed21;hpb=7238ed7ceebb781ebd757990832f55933a768b2c;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 9a567df..2a2da75 100644 --- a/fishladder.c +++ b/fishladder.c @@ -1,9 +1,32 @@ // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved //#define VG_CAPTURE_MODE -#define VG_STEAM +//#define VG_STEAM #define VG_STEAM_APPID 1218140U #include "vg/vg.h" + +enum world_button_mode +{ + k_world_button_mode_once, + k_world_button_mode_toggle +}; + +struct world_button +{ + v2i position; + + float light_target, light, extra_light; + int state; + + enum world_button_mode mode; +}; + +enum world_button_status +{ + k_world_button_on_enable, + k_world_button_on_disable +}; + #include "fishladder_resources.h" // #define STEAM_LEADERBOARDS @@ -38,7 +61,14 @@ enum e_world_button k_world_button_none = -1, k_world_button_sim = 0, k_world_button_pause = 1, - k_world_button_speedy = 2 + k_world_button_speedy = 2, + k_world_button_settings = 3 +}; + +enum e_game_state +{ + k_game_state_main, + k_game_state_settings }; #define FLAG_CANAL 0x1 @@ -49,6 +79,7 @@ enum e_world_button #define FLAG_INPUT 0x10 #define FLAG_OUTPUT 0x20 #define FLAG_WALL 0x40 +#define FLAG_EMITTER 0x80 #define FLAG_FLIP_FLOP 0x100 #define FLAG_TRIGGERED 0x200 @@ -142,7 +173,8 @@ struct title_start, title_count, desc_start, desc_count, score_start, score_count, - time_start, time_count + time_start, time_count, + grid_start, grid_count ; #pragma pack(push,1) @@ -160,21 +192,43 @@ struct } text_buffers; -struct world +static struct world { + // Things that are 'static', aka, initialized once + struct + { + struct world_button buttons[4]; + float zoom; + enum e_game_state state; + + struct cmp_level *lvl_to_load; + float lvl_load_time; + + float world_transition; + } + st; + #pragma pack(push,1) struct cell { u16 state; u16 links[2]; u8 config; - u8 pad0; + char cc; } *data; #pragma pack(pop) + + struct render_cmd + { + struct cell *ptr; + v2i pos; + } + *cmd_buf_tiles, *cmd_buf_specials; + + u32 tile_count, tile_special_count, max_commands; int initialzed; - int sim_run, max_runs; int sim_frame, sim_target; @@ -201,14 +255,7 @@ struct world v2i pos; //int id; } - *io; - - struct cell_button - { - float light_target, light; - int pressed; - } - buttons[4]; + *io; int w, h; @@ -237,12 +284,11 @@ struct world v2f physics_v; v2f physics_co; } - fishes[16]; + fishes[64]; int num_fishes; char map_name[64]; - //struct career_level *ptr_career_level; struct cmp_level *pCmpLevel; u32 score; @@ -252,16 +298,96 @@ struct world u16 id_drag_from; v2f drag_from_co; v2f drag_to_co; +} +world = +{ + .st = + { + .buttons = { { .mode = k_world_button_mode_toggle }, + { .mode = k_world_button_mode_toggle }, + { .mode = k_world_button_mode_toggle }, + { .mode = k_world_button_mode_toggle } } + } }; // Forward declerations // -------------------- +// Utility functions +// ----------------- + +static void colour_code_v3( char const cc, v3f target ); +static int hash21i( v2i p, u32 umod ); + +// Mesh functions +// -------------- +static void init_mesh( struct mesh *m, float const *tris, u32 length ); +static void free_mesh( struct mesh *m ); +static void use_mesh( struct mesh *m ); +static void draw_mesh( int const start, int const count ); + +// World buttons +// ------------- +static void level_selection_buttons(void); + +// Map/world interface +// ------------------- +static void map_free(void); +static void io_reset(void); +static struct cell *pcell( v2i pos ); +static void lcell( int id, v2i pos ); +static void map_reclassify( v2i start, v2i end, int update_texbuffer ); +static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, float size, u32 start ); +static void gen_level_text( struct cmp_level *pLevel ); +static int map_load( const char *str, const char *name ); +static void map_serialize( FILE *stream ); + +// Career +// ------ +static void career_serialize(void); +static void career_unlock_level( struct cmp_level *lvl ); +static void career_unlock_level( struct cmp_level *lvl ); +static void career_pass_level( struct cmp_level *lvl, int score, int upload ); +static void career_reset_level( struct cmp_level *lvl ); +static void career_load(void); +static void clear_animation_flags(void); + +// Gameplay main +// ------------- +static void simulation_stop(void); +static void simulation_start(void); +static int world_check_pos_ok( v2i co, int dist ); +static int cell_interactive( v2i co ); + +void vg_update(void); +static void render_tiles( v4f const regular_colour, v4f const selected_colour ); +static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour ); + +void vg_render(void); +void vg_ui(void); + +// Leaderboard stuff +// ----------------- +#ifdef STEAM_LEADERBOARDS +void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ); +void leaderboard_dispatch_score(void); +void leaderboard_found( LeaderboardFindResult_t *pCallback ); +void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback ); +void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ); +#endif + +// Console commands +// ---------------- static int console_credits( int argc, char const *argv[] ); static int console_save_map( int argc, char const *argv[] ); static int console_load_map( int argc, char const *argv[] ); static int console_changelevel( int argc, char const *argv[] ); +void vg_start(void); +void vg_free(void); + +int main( int argc, char *argv[] ); + // GLOBALS // =========================================================================================================== @@ -269,27 +395,65 @@ m3x3f m_projection; m3x3f m_view; m3x3f m_mdl; -struct world world; - // UTILITY // =========================================================================================================== -static void colour_code_v3( char const cc, v3f target ) +static int colour_set_id = 0; +static int world_theme_id = 0; + +static v3f colour_sets[][4] = { - static v3f colour_sets[] = - { { 1.0f, 0.9f, 0.3f }, - { 0.2f, 0.9f, 0.14f }, - { 0.4f, 0.8f, 1.00f }, - { 0.882f, 0.204f, 0.922f } - }; + { { 1.0f, 0.9f, 0.3f }, // Yellow + { 0.4f, 0.8f, 1.00f }, // Blue + { 0.2f, 0.9f, 0.14f }, // Green + { 0.882f, 0.204f, 0.922f } // Pink + }, + { { 1.0f, 0.9f, 0.3f }, // Yellow + { 0.4f, 0.8f, 1.00f }, // Blue + { 0.85f, 0.85f, 0.85f }, // Weiss + { 0.2f, 0.2f, 0.2f } // Black/Gray + }, + { { 1.0f, 0.9f, 0.3f }, // Yellow + { 0.827f, 0.373f, 0.718f }, // Pink + { 0.0f, 0.353f, 0.71f }, // Blue + { 0.863f, 0.196f, 0.125f } // Red + }, +}; + +static struct world_theme +{ + const char *name; + v3f colour_bg; + vg_tex2d *tex_tiles; +} +world_themes[] = +{ + { + "Wood", + {}, + &tex_tiles_wood + }, + { + "Minimal", + {}, + &tex_tiles_min + }, + { + "Lab", + {}, + &tex_tiles_lab + } +}; +static void colour_code_v3( char const cc, v3f target ) +{ if( cc >= 'a' && cc <= 'z' ) { int id = cc - 'a'; - if( id < vg_list_size( colour_sets ) ) + if( id < vg_list_size( colour_sets[0] ) ) { - v3_copy( colour_sets[ id ], target ); + v3_copy( colour_sets[colour_set_id][ id ], target ); return; } } @@ -373,11 +537,6 @@ static void use_mesh( struct mesh *m ) glBindVertexArray( m->vao ); } -static struct cell_button *get_wbutton( enum e_world_button btn ) -{ - return &world.buttons[ btn ]; -} - void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ); // WORLD/MAP @@ -387,6 +546,8 @@ static void map_free(void) { arrfree( world.data ); arrfree( world.io ); + + free( world.cmd_buf_tiles ); world.w = 0; world.h = 0; @@ -415,6 +576,12 @@ static struct cell *pcell( v2i pos ) return &world.data[ pos[1]*world.w + pos[0] ]; } +static void lcell( int id, v2i pos ) +{ + pos[0] = id % world.w; + pos[1] = (id - pos[0]) / world.w; +} + static void map_reclassify( v2i start, v2i end, int update_texbuffer ) { v2i full_start = { 1,1 }; @@ -446,12 +613,12 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) u8 height = 0; u8 config = 0x00; - if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) ) + if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) { for( int i = 0; i < vg_list_size( dirs ); i ++ ) { struct cell *neighbour = pcell((v2i){x+dirs[i][0], y+dirs[i][1]}); - if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) ) + if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) config |= 0x1 << i; } @@ -476,7 +643,7 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) 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)) + ((cell->state & FLAG_TARGETED) && ((cell->config != k_cell_type_split) && !(cell->state & FLAG_EMITTER))) ) && update_texbuffer ){ cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER); @@ -518,13 +685,15 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, invUv[0] = 1.0f / (float)font->width; invUv[1] = 1.0f / (float)font->height; + u16 base_idx = start * 4; + const char *_c = str; char c; while( (c = *(_c ++)) ) { if( c == '\n' ) { - cursor[1] += size * 1.25f; + cursor[1] -= size * 1.25f; cursor[0] = origin[0]; } else if( c >= 32 && c <= 126 ) @@ -560,12 +729,12 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, vt[3].colour = 0xffffffff; // Emit indices - ind[0] = count*4; - ind[1] = count*4+1; - ind[2] = count*4+2; - ind[3] = count*4; - ind[4] = count*4+2; - ind[5] = count*4+3; + ind[0] = base_idx+count*4; + ind[1] = base_idx+count*4+1; + ind[2] = base_idx+count*4+2; + ind[3] = base_idx+count*4; + ind[4] = base_idx+count*4+2; + ind[5] = base_idx+count*4+3; cursor[0] += (float)pch->advance * invScale; count ++; @@ -582,16 +751,15 @@ static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, ); glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo ); - glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof( u16 ), text_buffers.indices ); + glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof(u16), text_buffers.indices ); return count; } static void gen_level_text( struct cmp_level *pLevel ) { - text_buffers.title_count = gen_text_buffer( pLevel->title, &font_Ubuntu, (v2f){ 0.0f, 0.0f }, 1.0f, text_buffers.title_start ); - text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ 0.0f, 0.0f }, 0.5f, text_buffers.desc_start ); - text_buffers.desc_count = 0; + text_buffers.title_count = gen_text_buffer( pLevel->title, &font_Ubuntu, (v2f){ -5.0f, -0.6f }, 0.6f, text_buffers.title_start ); + text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ -5.0, -0.9f }, 0.25f, text_buffers.desc_start ); } static int map_load( const char *str, const char *name ) @@ -760,7 +928,10 @@ static int map_load( const char *str, const char *name ) struct cell *cell = &row[ cx ]; cell->config = 0xF; - if( *c == '+' || *c == '-' ) + cell->links[0] = 0; + cell->links[1] = 0; + + if( *c == '+' || *c == '-' || *c == '*' ) { struct cell_terminal *term = arraddnptr( world.io, 1 ); term->pos[0] = cx; @@ -768,8 +939,14 @@ static int map_load( const char *str, const char *name ) term->run_count = 1; term->runs[0].condition_count = 0; + + switch( *c ) + { + case '+': cell->state = FLAG_INPUT; break; + case '-': cell->state = FLAG_OUTPUT; break; + case '*': cell->state = FLAG_EMITTER; break; + } - cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT; reg_end ++; } else if( *c == '#' ) cell->state = FLAG_WALL; @@ -786,8 +963,6 @@ static int map_load( const char *str, const char *name ) 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; @@ -797,6 +972,18 @@ static int map_load( const char *str, const char *name ) c ++; } + + // Fix emitter CC code + for( int i = 0; i < arrlen( world.io ); i ++ ) + { + struct cell_terminal *term = &world.io[i]; + struct cell *cell = pcell( term->pos ); + + if( cell->state & FLAG_EMITTER ) + { + cell->cc = term->runs[0].conditions[0]; + } + } // Update data texture to fill out the background { @@ -807,7 +994,14 @@ static int map_load( const char *str, const char *name ) { u8 *px = &info_buffer[((x*64)+y)*4]; - px[0] = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ); + // Fade out edges of world so that there isnt an obvious line + int dist_x = 16 - VG_MIN( VG_MIN( x, 16 ), 16-VG_MAX( x-16-world.w, 0 ) ); + int dist_y = 16 - VG_MIN( VG_MIN( y, 16 ), 16-VG_MAX( y-16-world.h, 0 ) ); + int dist = VG_MAX( dist_x, dist_y ) * 16; + + int value = VG_MAX( 0, 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ) - dist ); + + px[0] = value; px[1] = 0; px[2] = 0; px[3] = 0; @@ -816,30 +1010,28 @@ static int map_load( const char *str, const char *name ) // Level selection area - // Beginner - for( int y = 16+2; y < 16+2+4; y ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - u8 *px = &info_buffer[((y*64)+16-1)*4]; - px[0] = 0x10; - } + struct career_level_pack *grid = &career_packs[ i ]; - // Intermediate - for( int y = 16+2; y < 16+2+6; y ++ ) - { - for( int x = 0; x < 3; x ++ ) + int j = 0; + + for( int y = 0; y < grid->dims[1]; y ++ ) { - u8 *px = &info_buffer[((y*64)+16-5+x)*4]; - px[0] = 0x10; + for( int x = 0; x < grid->dims[0]; x ++ ) + { + u8 *px = &info_buffer[((y+16+grid->origin[1])*64+16+x+grid->origin[0])*4]; + px[0] = 0x10; + + if( j < grid->count ) + { + struct cmp_level *lvl = &grid->pack[ j ++ ]; + v2i_add( grid->origin, (v2i){x,y}, lvl->btn.position ); + } + } } } - // Expert - for( int x = 1; x < 5; x ++ ) - { - u8 *px = &info_buffer[((16*64)+16-5+x)*4]; - px[0] = 0x10; - } - info_buffer[(((16+world.h-3)*64)+world.w+16-1)*4] = 0x30; info_buffer[(((16+world.h-2)*64)+world.w+16-1)*4] = 0x30; @@ -851,12 +1043,16 @@ static int map_load( const char *str, const char *name ) v2i turtle; v2i turtle_dir; int original_y; + + // Only make breakouts for terminals on the edge + if( !(term->pos[1] == 1 || term->pos[1] == world.h-2) ) + continue; turtle[0] = 16+term->pos[0]; turtle[1] = 16+term->pos[1]; turtle_dir[0] = 0; - turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1; + turtle_dir[1] = pcell(term->pos)->state & (FLAG_INPUT|FLAG_EMITTER)? 1: -1; original_y = turtle_dir[1]; info_buffer[((turtle[1]*64)+turtle[0])*4] = 0; @@ -910,7 +1106,8 @@ static int map_load( const char *str, const char *name ) 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->state & FLAG_CANAL) && (target->config == k_cell_type_split)) + || (target->state & FLAG_EMITTER) ) { if( target->links[ link_id ] ) { @@ -944,6 +1141,19 @@ static int map_load( const char *str, const char *name ) strncpy( world.map_name, name, vg_list_size( world.map_name )-1 ); world.initialzed = 1; + + // Setup world button locations + for( int i = 0; i < vg_list_size( world.st.buttons ); i ++ ) + { + struct world_button *btn = &world.st.buttons[i]; + btn->position[0] = world.w -1; + btn->position[1] = world.h -i -2; + } + + // Allocate buffers for render commands + world.cmd_buf_tiles = malloc( world.w*world.h* sizeof( struct render_cmd ) ); + world.max_commands = world.w*world.h; + return 1; IL_REG_ERROR: @@ -963,6 +1173,7 @@ 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_EMITTER ) 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 ); @@ -1050,9 +1261,9 @@ static void career_serialize(void) memset( encoded.reserved, 0, sizeof( encoded.reserved ) ); - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) { @@ -1084,13 +1295,36 @@ static void career_pass_level( struct cmp_level *lvl, int score, int upload ) { if( score < lvl->completed_score || lvl->completed_score == 0 ) { + #ifdef VG_STEAM if( !lvl->is_tutorial && upload ) leaderboard_set_score( lvl, score ); - + #endif + lvl->completed_score = score; } if( lvl->unlock ) career_unlock_level( lvl->unlock ); + + #ifdef VG_STEAM + if( lvl->achievement ) + { + sw_set_achievement( lvl->achievement ); + } + + // Check ALL maps to trigger master engineer + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) + { + struct career_level_pack *set = &career_packs[i]; + + for( int j = 0; j < set->count; j ++ ) + { + if( set->pack[j].completed_score == 0 ) + return; + } + } + + sw_set_achievement( "MASTER_ENGINEER" ); + #endif } } @@ -1107,7 +1341,7 @@ static void career_load(void) // Blank save state memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) ); - encoded.in_map = -1; + encoded.in_map = 0; encoded.levels[0].unlocked = 1; // Load and copy data into encoded @@ -1131,9 +1365,9 @@ static void career_load(void) vg_info( "No save file... Using blank one\n" ); // Reset memory - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) career_reset_level( &set->pack[j] ); @@ -1142,10 +1376,12 @@ static void career_load(void) // Header information // ================================= + struct cmp_level *lvl_to_load = &career_packs[0].pack[0]; + // Decode everything from dstate - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) { @@ -1155,18 +1391,17 @@ static void career_load(void) if( src->unlocked ) career_unlock_level( lvl ); if( src->score ) lvl->completed_score = src->score; - // ... if( lvl->serial_id == encoded.in_map ) - { - if( console_changelevel( 1, &lvl->map_name ) ) - { - world.pCmpLevel = lvl; - gen_level_text( world.pCmpLevel ); - } - } + lvl_to_load = lvl; } } + if( console_changelevel( 1, &lvl_to_load->map_name ) ) + { + world.pCmpLevel = lvl_to_load; + gen_level_text( world.pCmpLevel ); + } + career_load_success = 1; } @@ -1174,7 +1409,7 @@ static void career_load(void) // =========================================================================================================== static int is_simulation_running(void) { - return world.buttons[ k_world_button_sim ].pressed; + return world.st.buttons[ k_world_button_sim ].state; } static void clear_animation_flags(void) @@ -1185,8 +1420,8 @@ static void clear_animation_flags(void) static void simulation_stop(void) { - world.buttons[ k_world_button_sim ].pressed = 0; - world.buttons[ k_world_button_pause ].pressed = 0; + world.st.buttons[ k_world_button_sim ].state = 0; + world.st.buttons[ k_world_button_pause ].state = 0; world.num_fishes = 0; world.sim_frame = 0; @@ -1212,7 +1447,7 @@ static void simulation_start(void) world.sim_frame = 0; world.sim_run = 0; - world.sim_delta_speed = world.buttons[ k_world_button_speedy ].pressed? 10.0f: 2.5f; + world.sim_delta_speed = world.st.buttons[ k_world_button_speedy ].state? 10.0f: 2.5f; world.sim_delta_ref = vg_time; world.sim_internal_ref = 0.0f; world.sim_internal_time = 0.0f; @@ -1230,19 +1465,28 @@ static void simulation_start(void) } } -static int world_check_pos_ok( v2i co ) +static int world_check_pos_ok( v2i co, int dist ) { - return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1; + return (co[0] < dist || co[0] >= world.w-dist || co[1] < dist || co[1] >= world.h-dist)? 0: 1; } static int cell_interactive( v2i co ) { + struct cell *cell; + // Bounds check - if( !world_check_pos_ok( co ) ) + if( world_check_pos_ok( co, 1 ) ) + { + cell = pcell( co ); + if( cell->state & FLAG_EMITTER ) + return 1; + } + + if( !world_check_pos_ok( co, 2 ) ) return 0; // Flags check - if( world.data[ world.w*co[1] + co[0] ].state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) ) + if( cell->state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) ) return 0; // List of 3x3 configurations that we do not allow @@ -1299,7 +1543,7 @@ static int cell_interactive( v2i co ) { struct cell *cell = pcell((v2i){x,y}); - if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT)) ) + if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER)) ) blob |= 0x1 << ((y-(co[1]-2))*5 + x-(co[0]-2)); } @@ -1320,8 +1564,29 @@ static int cell_interactive( v2i co ) return 1; } -void vg_update(void) +static void vg_update(void) { + // Async events + if( world.st.lvl_to_load ) + { + world.st.world_transition = (world.st.lvl_load_time-vg_time) * 4.0f; + + if( vg_time > world.st.lvl_load_time ) + { + if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) ) + { + world.pCmpLevel = world.st.lvl_to_load; + gen_level_text( world.pCmpLevel ); + } + + world.st.lvl_to_load = NULL; + } + } + else + { + world.st.world_transition = vg_minf( 1.0f, (vg_time-world.st.lvl_load_time) * 4.0f ); + } + // Camera // ======================================================================================================== @@ -1331,17 +1596,28 @@ void vg_update(void) static float size_current = 2.0f; static v3f origin_current = { 0.0f, 0.0f, 0.0f }; + static v2f drag_offset = { 0.0f, 0.0f }; + static v2f view_point = { 0.0f, 0.0f }; + v2f result_view; + + size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f; - size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f; - - v3f origin; + v2f origin; + v2f vt_target; + origin[0] = floorf( -0.5f * ((float)world.w-4.5f) ); origin[1] = floorf( -0.5f * world.h ); - origin[2] = 0.0f; + // Create and clamp result view + v2_add( view_point, drag_offset, result_view ); + result_view[0] = vg_clampf( result_view[0], -world.st.zoom, world.st.zoom ); + result_view[1] = vg_clampf( result_view[1], -world.st.zoom*r1, world.st.zoom*r1 ); + + v2_add( origin, result_view, vt_target ); + // Lerp towards target - size_current = vg_lerpf( size_current, size, vg_time_delta * 6.0f ); - v2_lerp( origin_current, origin, vg_time_delta * 6.0f, origin_current ); + size_current = vg_lerpf( size_current, size - world.st.zoom, vg_time_delta * 6.0f ); + v2_lerp( origin_current, vt_target, vg_time_delta * 6.0f, origin_current ); m3x3_projection( m_projection, -size_current, size_current, -size_current*r1, size_current*r1 ); m3x3_identity( m_view ); @@ -1356,6 +1632,50 @@ void vg_update(void) world.tile_x = floorf( world.tile_pos[0] ); world.tile_y = floorf( world.tile_pos[1] ); + // Camera dragging + { + static v2f drag_origin; // x/y pixel + + if( vg_get_button_down( "tertiary" ) ) + v2_copy( vg_mouse, drag_origin ); + else if( vg_get_button( "tertiary" ) ) + { + // get offset + v2_sub( vg_mouse, drag_origin, drag_offset ); + v2_div( drag_offset, (v2f){ vg_window_x, vg_window_y }, drag_offset ); + v2_mul( drag_offset, (v2f){ size_current*2.0f, -size_current*r1*2.0f }, drag_offset ); + } + else + { + v2_copy( result_view, view_point ); + v2_copy( (v2f){0.0f,0.0f}, drag_offset ); + } + } + + // Zooming + { + v2f mview_local; + v2f mview_new; + v2f mview_cur; + v2f mview_delta; + float rsize; + + rsize = size-world.st.zoom; + + v2_div( vg_mouse, (v2f){ vg_window_x*0.5f, vg_window_y*0.5f }, mview_local ); + v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_cur ); + + world.st.zoom = vg_clampf( world.st.zoom + vg_mouse_wheel[1], 0.0f, size - 4.0f ); + + // Recalculate new position + rsize = size-world.st.zoom; + v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_new ); + + // Apply offset + v2_sub( mview_new, mview_cur, mview_delta ); + v2_add( mview_delta, view_point, view_point ); + } + // Tilemap // ======================================================================================================== if( !is_simulation_running() && !gui_want_mouse() ) @@ -1367,41 +1687,43 @@ void vg_update(void) 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") ) - modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL; - - if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) ) + + if( !(cell_ptr->state & FLAG_EMITTER) ) { - cell_ptr->state &= ~FLAG_CANAL; - cell_ptr->state |= modify_state; + if( vg_get_button_down("primary") ) + modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL; - if( cell_ptr->state & FLAG_CANAL ) + if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) ) { - cell_ptr->links[0] = 0; - cell_ptr->links[1] = 0; + cell_ptr->state &= ~FLAG_CANAL; + cell_ptr->state |= modify_state; - sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 ); - world.score ++; - } - else - { - sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 ); - world.score --; - } + 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 + { + sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 ); + world.score --; + } - map_reclassify( (v2i){ world.tile_x -2, world.tile_y -2 }, + 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->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) ) - { - world.id_drag_from = world.selected; - - struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ]; - v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co ); + } + + if( vg_get_button_down("secondary") && (cell_ptr->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) ) + { + world.id_drag_from = world.selected; + + struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ]; + v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co ); + } } float local_x = vg_mouse_ws[0] - (float)world.tile_x; @@ -1426,7 +1748,8 @@ void vg_update(void) world.id_drag_from = 0; } - else if( world.id_drag_from && (cell_ptr->state & FLAG_CANAL) && (cell_ptr->config == k_cell_type_split) ) + else if( world.id_drag_from && (cell_ptr->state & (FLAG_CANAL|FLAG_EMITTER)) && + ((cell_ptr->config == k_cell_type_split) || (cell_ptr->state & FLAG_EMITTER)) ) { world.drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f); world.drag_to_co[1] = (float)world.tile_y + 0.25f; @@ -1445,17 +1768,20 @@ void vg_update(void) current_connection->state &= ~FLAG_IS_TRIGGER; current_connection->links[ link_id ] = 0; } - - if( drag_ptr->links[ link_id ^ 0x1 ] ) + + for( u32 i = 0; i < 2; i ++ ) { - 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; + if( drag_ptr->links[ i ] ) + { + vg_warn( "Destroying link %u (%hu)\n", i, drag_ptr->links[ i ] ); + + struct cell *current_connection = &world.data[ drag_ptr->links[ i ]]; + if( current_connection->links[ i ^ 0x1 ] == 0 ) + current_connection->state &= ~FLAG_TARGETED; + + current_connection->links[ i ] = 0; + drag_ptr->links[ i ] = 0; + } } // Create the new connection @@ -1490,7 +1816,7 @@ void vg_update(void) { float old_time = world.sim_internal_time; - if( !world.buttons[ k_world_button_pause ].pressed ) + if( !world.st.buttons[ k_world_button_pause ].state ) world.sim_internal_time = world.sim_internal_ref + (vg_time-world.sim_delta_ref) * world.sim_delta_speed; else world.sim_internal_time = vg_lerpf( world.sim_internal_time, world.sim_internal_ref + world.pause_offset_target, vg_time_delta*15.0f ); @@ -1513,7 +1839,7 @@ void vg_update(void) { cell->state &= ~FLAG_FLIP_ROTATING; } - if( cell->state & FLAG_IS_TRIGGER ) + if( cell->state & (FLAG_IS_TRIGGER|FLAG_EMITTER) ) cell->state &= ~FLAG_TRIGGERED; } @@ -1638,7 +1964,7 @@ void vg_update(void) } else { - if( world_check_pos_ok( fish->pos ) ) + if( world_check_pos_ok( fish->pos, 2 ) ) fish->state = k_fish_state_bg; else { @@ -1654,7 +1980,7 @@ void vg_update(void) { v2i_add( fish->pos, fish->dir, fish->pos ); - if( !world_check_pos_ok( fish->pos ) ) + if( !world_check_pos_ok( fish->pos, 2 ) ) { fish->state = k_fish_state_dead; fish->death_time = -1000.0f; @@ -1668,8 +1994,10 @@ void vg_update(void) 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 ) { + #ifdef VG_STEAM sw_set_achievement( "CAN_DO_THAT" ); - + #endif + fish->state = k_fish_state_soon_alive; fish->dir[0] = 0; @@ -1698,9 +2026,12 @@ void vg_update(void) { struct fish *fish = &world.fishes[i]; + // Apply movement if( fish->state == k_fish_state_alive ) - { v2i_add( fish->pos, fish->dir, fish->pos ); + + if( fish->state == k_fish_state_alive || fish->state == k_fish_state_soon_alive ) + { struct cell *cell_current = pcell( fish->pos ); if( cell_current->state & FLAG_IS_TRIGGER ) @@ -1709,12 +2040,34 @@ void vg_update(void) 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; + // Spawn new marble + if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED)) + { + struct fish *fish = &world.fishes[ world.num_fishes ]; + lcell( cell_current->links[trigger_id], fish->pos ); + + fish->state = k_fish_state_soon_alive; + fish->payload = target_peice->cc; + + if( target_peice->config != k_cell_type_stub ) + { + struct cell_description *desc = &cell_descriptions[ target_peice->config ]; + v2i_copy( desc->start, fish->dir ); + fish->flow_reversed = 1; + + world.num_fishes ++; + alive_count ++; + } + } else - target_peice->state &= ~FLAG_FLIP_FLOP; + { + if( trigger_id ) + target_peice->state |= FLAG_FLIP_FLOP; + else + target_peice->state &= ~FLAG_FLIP_FLOP; + } + + cell_current->state |= FLAG_TRIGGERED; } } } @@ -1734,7 +2087,7 @@ void vg_update(void) { fj = &world.fishes[j]; - if( (fj->state == k_fish_state_alive) ) + if( fj->state == k_fish_state_alive ) { v2i fi_prev; v2i fj_prev; @@ -1755,8 +2108,10 @@ void vg_update(void) if( collide_next_frame || collide_this_frame ) { + #ifdef VG_STEAM sw_set_achievement( "BANG" ); - + #endif + // Shatter death (+0.5s) float death_time = world.sim_internal_time + ( collide_this_frame? 0.0f: 0.5f ); @@ -1818,9 +2173,8 @@ void vg_update(void) for( int i = 0; i < arrlen( world.io ); i ++ ) { struct cell_terminal *term = &world.io[ i ]; - int is_input = pcell(term->pos)->state & FLAG_INPUT; - if( !is_input ) + if( pcell(term->pos)->state & FLAG_OUTPUT ) { struct terminal_run *run = &term->runs[ world.sim_run ]; @@ -1857,7 +2211,7 @@ void vg_update(void) world.sim_delta_ref = vg_time; world.sim_internal_ref = 0.0f; - if( world.buttons[ k_world_button_pause ].pressed ) + if( world.st.buttons[ k_world_button_pause ].state ) world.pause_offset_target = 0.5f; else world.pause_offset_target = 0.0f; @@ -1894,9 +2248,11 @@ void vg_update(void) } else { + #ifdef VG_STEAM if( world.sim_run > 0 ) sw_set_achievement( "GOOD_ENOUGH" ); - + #endif + vg_error( "Level failed :(\n" ); } @@ -2007,10 +2363,42 @@ void vg_update(void) } } -void leaderboard_found( LeaderboardFindResult_t *pCallback ); -void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback ); +static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4f const selected_colour ) +{ + int selected = world.selected == pos[1]*world.w + pos[0]; + + int tile_offsets[][2] = + { + {2, 0}, {0, 3}, {0, 2}, {2, 2}, + {1, 0}, {2, 3}, {3, 2}, {1, 3}, + {3, 1}, {0, 1}, {1, 2}, {2, 1}, + {1, 1}, {3, 3}, {2, 1}, {2, 1} + }; + + int uv[2]; + + uv[0] = tile_offsets[ ptr->config ][0]; + uv[1] = tile_offsets[ ptr->config ][1]; + + glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), + (float)pos[0], + (float)pos[1], + uv[0], + uv[1] + ); -static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour ) + if( selected ) + { + glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour ); + draw_mesh( 0, 2 ); + glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour ); + } + else + draw_mesh( 0, 2 ); +} + +// Renders specific chunk of tiles +static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour ) { v2i full_start = { 0,0 }; v2i full_end = { world.w, world.h }; @@ -2020,177 +2408,110 @@ static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f cons start = full_start; end = full_end; } - - glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour ); for( int y = start[1]; y < end[1]; y ++ ) { for( int x = start[0]; x < end[0]; x ++ ) { - struct cell *cell = pcell((v2i){x,y}); - int selected = world.selected == y*world.w + x; - - int tile_offsets[][2] = - { - {2, 0}, {0, 3}, {0, 2}, {2, 2}, - {1, 0}, {2, 3}, {3, 2}, {1, 3}, - {3, 1}, {0, 1}, {1, 2}, {2, 1}, - {1, 1}, {3, 3}, {2, 1}, {2, 1} - }; - - int uv[2] = { 3, 0 }; - - if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) ) - { - uv[0] = tile_offsets[ cell->config ][0]; - uv[1] = tile_offsets[ cell->config ][1]; - } else continue; - - glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y, uv[0], uv[1] ); - if( selected ) - { - glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour ); - draw_mesh( 0, 2 ); - glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour ); - } - else - draw_mesh( 0, 2 ); + v2i pos = { x, y }; + struct cell *cell = pcell( pos ); + + if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) + render_tile( pos, cell, regular_colour, selected_colour ); } } } -static void wbutton_run( enum e_world_button btn_name, v2f btn_tex ) +// Renders all tiles in the command list +static void render_tiles( v4f const regular_colour, v4f const selected_colour ) { - static v3f button_colours[] = { - {0.204f, 0.345f, 0.553f}, - {0.204f, 0.345f, 0.553f}, - {0.553f, 0.345f, 0.204f}, - {1.0f, 0.0f, 0.0f} + glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour ); + + struct render_list + { + struct render_cmd *arr; + u32 count; + } + render_lists[] = { + { world.cmd_buf_tiles, world.tile_count }, + { world.cmd_buf_specials, world.tile_special_count } }; - struct cell_button *btn = &world.buttons[btn_name]; - - // Interaction - int tex_offset = 0; - - int is_hovering = (world.tile_x == world.w-1 && world.tile_y == world.h-btn_name-2)?1:0; - if( vg_get_button_up( "primary" ) && is_hovering ) + for( int i = 0; i < vg_list_size( render_lists ); i ++ ) { - // Click event - if( btn_name == k_world_button_sim ) + struct render_list *list = &render_lists[i]; + for( int j = 0; j < list->count; j ++ ) { - if( world.buttons[ k_world_button_pause ].pressed ) - { - if( !btn->pressed ) - { - btn->pressed = 1; - simulation_start(); - - world.pause_offset_target = 0.5f; - } - else - world.pause_offset_target += 1.0f; - } - else - { - btn->pressed ^= 0x1; - - if( btn->pressed ) - simulation_start(); - else - simulation_stop(); - } - } - else if( btn_name == k_world_button_pause ) - { - btn->pressed ^= 0x1; - - world.sim_internal_ref = world.sim_internal_time; - world.sim_delta_ref = vg_time; - - if( btn->pressed ) - { - float time_frac = world.sim_internal_time-floorf(world.sim_internal_time); - world.pause_offset_target = 0.5f - time_frac; - } - else - world.pause_offset_target = 0.0f; - } - else if( btn_name == k_world_button_speedy ) - { - btn->pressed ^= 0x1; - - world.sim_delta_speed = btn->pressed? 10.0f: 2.5f; - world.sim_delta_ref = vg_time; - world.sim_internal_ref = world.sim_internal_time; - } - else - { - btn->pressed ^= 0x1; + struct render_cmd *cmd = &list->arr[j]; + struct cell *cell = cmd->ptr; + + render_tile( cmd->pos, cell, regular_colour, selected_colour ); } - - sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 ); } - - // Drawing - if( btn->pressed ) +} + +static int world_button_exec( struct world_button *btn, v2f texture, v3f colour, enum world_button_status *status ) +{ + static v2i click_grab = { -9999, -9999 }; + + // Reset click_grab + if( !btn ) { - if( is_hovering ) - { - btn->light_target = 0.9f; - } - else - { - if( btn_name == k_world_button_sim && world.buttons[ k_world_button_pause ].pressed ) - btn->light_target = fabsf(sinf( vg_time * 2.0f )) * 0.3f + 0.3f; - else - btn->light_target = 0.8f; - } + click_grab[0] = -9999; + click_grab[1] = -9999; + return 0; } - else - { + + v2i click_tile = { world.tile_x, world.tile_y }; + + int triggered = 0; + int is_hovering = v2i_eq( click_tile, btn->position ); + + // Set up light targets before logic runs + if( btn->state ) + btn->light_target = is_hovering? 0.9f: 0.8f; + else btn->light_target = is_hovering? 0.2f: 0.0f; - } if( vg_get_button( "primary" ) && is_hovering ) btn->light_target = 1.0f; - btn->light = vg_lerpf( btn->light, btn->light_target, vg_time_delta*26.0f ); - - // Draw - if( btn_name == k_world_button_sim && world.buttons[ k_world_button_sim ].pressed ) + // Process click action + if( is_hovering ) { - if( world.buttons[ k_world_button_pause ].pressed ) - tex_offset = 3; - else - tex_offset = 2; + if( vg_get_button_down( "primary" ) && is_hovering ) + v2i_copy( click_tile, click_grab ); + else if( v2i_eq( click_grab, click_tile ) && vg_get_button_up( "primary" ) ) + { + // Click event + *status = btn->state? k_world_button_on_disable: k_world_button_on_enable; + + if( btn->mode == k_world_button_mode_toggle ) + btn->state ^= 0x1; + + sfx_set_play( &audio_clicks, &audio_system_ui, btn->state? 1:0 ); + triggered = 1; + } } - + + // Drawing stage v4f final_colour; - v3_copy( button_colours[ btn_name ], final_colour ); - final_colour[3] = btn->light; - glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), - world.w-1, - world.h-btn_name-2, - (float)(btn_tex[0]+tex_offset), - btn_tex[1] + btn->light = vg_lerpf( btn->light, btn->light_target + btn->extra_light, vg_time_delta*26.0f ); + + v3_copy( colour, final_colour ); + final_colour[3] = btn->light; + + glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), + btn->position[0], + btn->position[1], + texture[0], + texture[1] ); glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour ); - draw_mesh( 0, 2 ); -} -static void wbutton_draw( v2i pos, v2f tex, v4f colour ) -{ - glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), - pos[0], - pos[1], - tex[0], - tex[1] - ); - glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, colour ); - draw_mesh( 0, 2 ); + return triggered; } static void level_selection_buttons(void) @@ -2198,122 +2519,63 @@ static void level_selection_buttons(void) v3f tutorial_colour = { 0.204f, 0.345f, 0.553f }; v3f locked_colour = { 0.2f, 0.2f, 0.2f }; - struct button_grid - { - v3f primary_colour; - v2i origin; - v2i dims; - struct cmp_level *levels; - int count; - } - grids[] = - { - { - .primary_colour = { 0.204f, 0.345f, 0.553f }, - .origin = { -1, 2 }, - .dims = { 1, 4 }, - .levels = cmp_levels_tutorials, - .count = vg_list_size( cmp_levels_tutorials ) - }, - { - .primary_colour = { 0.304f, 0.245f, 0.553f }, - .origin = { -5, 2 }, - .dims = { 3, 6 }, - .levels = cmp_levels_basic, - .count = vg_list_size( cmp_levels_basic ) - }, - { - .primary_colour = { 0.553f, 0.345f, 0.204f }, - .origin = { -4, 0 }, - .dims = { 4, 1 }, - .levels = cmp_levels_grad, - .count = vg_list_size( cmp_levels_grad ) - } - }; - - v2f tex_coord = { 0.0f, 0.0f }; - v4f final_colour = { 0.0f, 0.0f, 0.0f, 0.2f }; - v2i button_pos; - static struct cmp_level *select_from = NULL; struct cmp_level *switch_level_to = NULL; - - if( vg_get_button_down( "primary" ) ) - select_from = NULL; - - for( int i = 0; i < vg_list_size( grids ); i ++ ) + + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct button_grid *grid = &grids[i]; - - int j = 0; + struct career_level_pack *grid = &career_packs[i]; - for( int x = 0; x < grid->dims[0]; x ++ ) + for( int j = 0; j < grid->count; j ++ ) { - for( int y = 0; y < grid->dims[1]; y ++ ) - { - if( j < grid->count ) - { - struct cmp_level *lvl = &grid->levels[ j ]; - - // Determine colour - if( lvl->unlocked ) - { - if( lvl->is_tutorial ) - v3_copy( tutorial_colour, final_colour ); - else - v3_copy( grid->primary_colour, final_colour ); - - if( lvl->completed_score ) - final_colour[3] = 0.8f; - else - final_colour[3] = 0.2f; - } - else v3_copy( locked_colour, final_colour ); - - v2i_add( grid->origin, (v2i){ x,y }, button_pos ); - int is_hovering = v2i_eq( (v2i){world.tile_x, world.tile_y}, button_pos ); - - if( is_hovering ) - { - final_colour[3] += 0.1f; - - // Up click - if( vg_get_button_up( "primary" ) ) - if( select_from == lvl && lvl->unlocked ) - { - switch_level_to = lvl; - sfx_set_play( &audio_clicks, &audio_system_ui, 1 ); - } - - // Start click - if( vg_get_button_down( "primary" ) ) - select_from = lvl; - - if( vg_get_button( "primary" ) ) - final_colour[3] += 0.2f; - } - - if( world.pCmpLevel == lvl ) - final_colour[3] += fabsf(sinf( vg_time * 2.0f )) * 0.2f; - - wbutton_draw( (v2i){ grid->origin[0] + x, grid->origin[1] + y }, tex_coord, final_colour ); - } - else break; + struct cmp_level *lvl = &grid->pack[ j ]; - j ++; + if( world.pCmpLevel == lvl ) + lvl->btn.extra_light = 0.35f + fabsf(sinf( vg_time * 2.0f )) * 0.05f; + else lvl->btn.extra_light = 0.2f; + + if( lvl->completed_score ) + lvl->btn.extra_light += 0.8f; + + enum world_button_status status; + if( world_button_exec( + &lvl->btn, + (v2f){0.0f,0.0f}, + lvl->unlocked? (lvl->is_tutorial? tutorial_colour: grid->primary_colour): locked_colour, + &status + )) + { + if( status == k_world_button_on_enable && lvl->unlocked ) + switch_level_to = lvl; } } } if( switch_level_to ) { + world.st.lvl_to_load = switch_level_to; + world.st.lvl_load_time = vg_time + 0.25f; + world.st.world_transition = 1.0f; + + /* if( console_changelevel( 1, &switch_level_to->map_name ) ) { world.pCmpLevel = switch_level_to; gen_level_text( world.pCmpLevel ); } + */ } } +static void render_sprite( enum sprites_auto_combine_index id, v3f pos ) +{ + struct vg_sprite *sp = &sprites_auto_combine[ id ]; + + glUniform4fv( SHADER_UNIFORM( shader_sprite, "uUv" ), 1, sp->uv_xywh ); + glUniform3f( SHADER_UNIFORM( shader_sprite, "uPos" ), pos[0], pos[1], pos[2] * world.st.world_transition ); + + draw_mesh( 0, 2 ); +} + void vg_render(void) { glViewport( 0,0, vg_window_x, vg_window_y ); @@ -2331,8 +2593,38 @@ void vg_render(void) int const empty_start = circle_base+32; int const empty_count = circle_base+32*2; + struct world_theme *theme = &world_themes[ world_theme_id ]; + if( !world.initialzed ) return; + + // Extract render commands + world.tile_count = 0; + world.tile_special_count = 0; + + for( int y = 1; y < world.h-1; y ++ ) + { + for( int x = 1; x < world.w-1; x ++ ) + { + struct cell *cell = pcell((v2i){x,y}); + + if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) + { + struct render_cmd *cmd; + + if( cell->config == k_cell_type_split || (cell->state & FLAG_EMITTER ) ) + cmd = &world.cmd_buf_tiles[ world.max_commands - (++ world.tile_special_count) ]; + else + cmd = &world.cmd_buf_tiles[ world.tile_count ++ ]; + + cmd->pos[0] = x; + cmd->pos[1] = y; + cmd->ptr = cell; + } + } + } + + world.cmd_buf_specials = &world.cmd_buf_tiles[ world.max_commands - world.tile_special_count ]; // BACKGROUND // ======================================================================================================== @@ -2351,7 +2643,8 @@ void vg_render(void) glActiveTexture( GL_TEXTURE1 ); glBindTexture( GL_TEXTURE_2D, world.random_samples ); glUniform1i( SHADER_UNIFORM( shader_background, "uSamplerNoise" ), 1 ); - + glUniform1f( SHADER_UNIFORM( shader_background, "uVisibility" ), 1.0f ); //world.st.world_transition ); + draw_mesh( 0, 2 ); // TILESET BACKGROUND LAYER @@ -2365,6 +2658,7 @@ void vg_render(void) glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_main, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); glUniform1f( SHADER_UNIFORM( shader_tile_main, "uGhost" ), 0.0f ); glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 0.0f ); + glUniform1f( SHADER_UNIFORM( shader_tile_main, "uVisibility" ), world.st.world_transition * 2.0f ); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -2373,11 +2667,11 @@ void vg_render(void) // Bind textures vg_tex2d_bind( &tex_tile_data, 0 ); glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 ); - - vg_tex2d_bind( &tex_wood, 1 ); + + vg_tex2d_bind( theme->tex_tiles, 1 ); glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 ); - render_tiles( NULL, NULL, colour_default, colour_default ); + render_tiles( colour_default, colour_default ); // MARBLES // ======================================================================================================== @@ -2387,7 +2681,7 @@ void vg_render(void) vg_tex2d_bind( &tex_ball_noise, 0 ); glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 ); - if( get_wbutton( k_world_button_sim )->pressed ) + if( world.st.buttons[ k_world_button_sim ].state ) { for( int i = 0; i < world.num_fishes; i ++ ) { @@ -2433,55 +2727,51 @@ void vg_render(void) vg_tex2d_bind( &tex_tile_data, 0 ); glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 ); - vg_tex2d_bind( &tex_wood, 1 ); + // TODO: is this needed to be rebinded? + vg_tex2d_bind( theme->tex_tiles, 1 ); glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 ); glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 1.0f ); - render_tiles( NULL, NULL, colour_default, colour_selected ); + render_tiles( colour_default, colour_selected ); // Draw splitters - for( int y = 2; y < world.h-2; y ++ ) + for( int i = 0; i < world.tile_special_count; i ++ ) { - for( int x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; - if( cell->state & FLAG_CANAL ) + 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( cell->config == k_cell_type_split ) + if( (world.frame_lerp > curve_7_linear_section) ) { - 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 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; - } + 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; } - - 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, - cell->state & FLAG_TARGETED? 3.0f: 0.0f, - 0.0f - ); - draw_mesh( 0, 2 ); + else + rotation *= -1.0f; } } + + 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)cmd->pos[0], + (float)cmd->pos[1] + 0.125f, + cell->state & FLAG_TARGETED? 3.0f: 0.0f, + 0.0f + ); + draw_mesh( 0, 2 ); } } @@ -2500,7 +2790,7 @@ void vg_render(void) glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform ); glUniform2fv( SHADER_UNIFORM( shader_tile_main, "uMousePos" ), 1, world.tile_pos ); - render_tiles( new_begin, new_end, colour_default, colour_default ); + render_tile_block( new_begin, new_end, colour_default, colour_default ); world.data[ world.selected ].state ^= FLAG_CANAL; map_reclassify( new_begin, new_end, 0 ); @@ -2514,12 +2804,102 @@ void vg_render(void) vg_tex2d_bind( &tex_buttons, 0 ); glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 ); - wbutton_run( k_world_button_sim, (v2f){ 0.0f, 3.0f } ); - wbutton_run( k_world_button_pause, (v2f){ 1.0f, 3.0f } ); - wbutton_run( k_world_button_speedy, (v2f){ 0.0f, 2.0f } ); + enum world_button_status stat; + int world_paused = world.st.buttons[k_world_button_pause].state; + int world_running = world.st.buttons[k_world_button_sim].state; + + float sim_icon_x = world_paused? 3.0f: (world_running? 2.0f: 0.0f); + + v3f btn_dark_blue = { 0.204f, 0.345f, 0.553f }; + v3f btn_orange = { 0.553f, 0.345f, 0.204f }; + + if( world_button_exec( &world.st.buttons[k_world_button_sim], (v2f){ sim_icon_x, 3.0f }, btn_dark_blue, &stat )) + { + if( stat == k_world_button_on_enable ) + { + simulation_start(); + + if( world_paused ) + world.pause_offset_target = 0.5f; + } + else + { + if( world_paused ) + { + // Trigger single step + world.pause_offset_target += 1.0f; + world.st.buttons[k_world_button_sim].state = 1; + } + else + { + simulation_stop(); + } + } + } + if( world_button_exec( &world.st.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat )) + { + world.sim_internal_ref = world.sim_internal_time; + world.sim_delta_ref = vg_time; + + if( stat == k_world_button_on_enable ) + { + float time_frac = world.sim_internal_time-floorf(world.sim_internal_time); + world.pause_offset_target = 0.5f - time_frac; + } + else + world.pause_offset_target = 0.0f; + } + + if( world_button_exec( &world.st.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat )) + { + world.sim_delta_speed = stat == k_world_button_on_enable? 10.0f: 2.5f; + + if( !world_paused ) + { + world.sim_delta_ref = vg_time; + world.sim_internal_ref = world.sim_internal_time; + } + } + + if( world_button_exec( &world.st.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat )) + { + world.st.state = stat == k_world_button_on_enable? k_game_state_settings: k_game_state_main; + } + level_selection_buttons(); + if( vg_get_button_up( "primary" ) ) + world_button_exec( NULL, NULL, NULL, NULL ); + + // SPRITES + // ======================================================================================================== + SHADER_USE( shader_sprite ); + glUniformMatrix3fv( SHADER_UNIFORM( shader_sprite, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); + + vg_tex2d_bind( &tex_sprites, 0 ); + glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 ); + + for( int i = 0; i < world.tile_special_count; i ++ ) + { + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; + + if( cell->config == k_cell_type_split ) + { + v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f }; + + v3f p0 = { 0.0f, 0.0f, 4.0f }; + v3f p1 = { 0.0f, 0.0f, 4.0f }; + + v2_add( center, (v2f){ -0.25f, -0.25f }, p0 ); + v2_add( center, (v2f){ 0.25f, -0.25f }, p1 ); + + render_sprite( k_sprite_jack_1, p0 ); + render_sprite( k_sprite_jack_2, p1 ); + } + } + // TEXT ELEMENTS // ======================================================================================================== SHADER_USE( shader_sdf ); @@ -2529,9 +2909,13 @@ void vg_render(void) vg_tex2d_bind( &tex_ubuntu, 0 ); glUniform1i( SHADER_UNIFORM( shader_sdf, "uTexGlyphs" ), 0 ); + glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f ); glDrawElements( GL_TRIANGLES, text_buffers.title_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.title_start*6*sizeof(u16) ) ); glDrawElements( GL_TRIANGLES, text_buffers.desc_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.desc_start*6*sizeof(u16) ) ); + glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 0.17f ); + glDrawElements( GL_TRIANGLES, text_buffers.grid_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.grid_start*6*sizeof(u16) ) ); + // WIRES // ======================================================================================================== //glDisable(GL_BLEND); @@ -2562,41 +2946,53 @@ void vg_render(void) float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f; float rp_x2 = 1.0f-rp_xa; - for( int y = 2; y < world.h-2; y ++ ) + for( int i = 0; i < world.tile_special_count; i ++ ) { - for( int x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; - if( cell->state & FLAG_CANAL ) + if( cell->state & FLAG_TARGETED ) + { + for( int j = 0; j < 2; j ++ ) { - if( cell->state & FLAG_IS_TRIGGER ) - { - struct cell_description *desc = &cell_descriptions[ cell->config ]; + if( !cell->links[j] ) + continue; + + struct cell *other_cell = &world.data[ cell->links[ j ]]; + struct cell_description *desc = &cell_descriptions[ other_cell->config ]; - 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; - endpoint[1] = y; - - v2_add( desc->trigger_pos, endpoint, endpoint ); - - glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, trigger_id? wire_right_colour: wire_left_colour ); - glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f ); - glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), cell->state & FLAG_TRIGGERED? rp_xa: 0.0f ); - glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.18f ); - glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.18f ); - glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); + int x2 = cell->links[j] % world.w; + int y2 = (cell->links[j] - x2) / world.w; + + v2f startpoint; + v2f endpoint; + + endpoint[0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f); + endpoint[1] = (float)cmd->pos[1] + 0.25f; + + startpoint[0] = x2; + startpoint[1] = y2; + + v2_add( desc->trigger_pos, startpoint, startpoint ); + + if( cmd->ptr->state & FLAG_EMITTER ) + { + v4f wire_colour; + colour_code_v3( other_cell->cc, wire_colour ); + wire_colour[3] = 1.0f; + + glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour ); + } + else + { + glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour ); } + + glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), other_cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f ); + glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), other_cell->state & FLAG_TRIGGERED? rp_xa: 0.0f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), startpoint[0], startpoint[1], 0.18f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), endpoint[0], endpoint[1], 0.18f ); + glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); } } } @@ -2608,77 +3004,128 @@ void vg_render(void) glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); use_mesh( &world.shapes ); - for( int y = 2; y < world.h-2; y ++ ) + for( int i = 0; i < world.tile_special_count; i ++ ) { - for( int x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; - if( cell->state & FLAG_CANAL ) + if( cell->state & FLAG_TARGETED ) + { + for( int j = 0; j < 2; j ++ ) { - if( cell->state & FLAG_IS_TRIGGER ) + if( !cell->links[j] ) + continue; + + struct cell *other_cell = &world.data[ cell->links[ j ]]; + + struct cell_description *desc = &cell_descriptions[ other_cell->config ]; + + int x2 = cell->links[j] % world.w; + int y2 = (cell->links[j] - x2) / world.w; + + v2f pts[2]; + + pts[0][0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f); + pts[0][1] = (float)cmd->pos[1] + 0.25f; + + pts[1][0] = x2; + pts[1][1] = y2; + + v2_add( desc->trigger_pos, pts[1], pts[1] ); + + if( other_cell->state & FLAG_EMITTER ) { - struct cell_description *desc = &cell_descriptions[ cell->config ]; + v4f wire_colour; + colour_code_v3( other_cell->cc, wire_colour ); + + v3_muls( wire_colour, 0.8f, wire_colour ); + wire_colour[3] = 1.0f; + + glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour ); + } + else + { + glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour ); + } - 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 pts[2]; - - pts[0][0] = (float)x2 + (trigger_id? 0.75f: 0.25f); - pts[0][1] = (float)y2 + 0.25f; - - pts[1][0] = x; - pts[1][1] = y; - - v2_add( desc->trigger_pos, pts[1], pts[1] ); - - glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), - 1, trigger_id? wire_right_colour: wire_left_colour ); - - for( int i = 0; i < 2; i ++ ) - { - glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), - pts[i][0], - pts[i][1], - 0.08f - ); - draw_mesh( filled_start, filled_count ); - } + for( int i = 0; i < 2; i ++ ) + { + glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), + pts[i][0], + pts[i][1], + 0.08f + ); + draw_mesh( filled_start, filled_count ); } } } } - + // SUB SPLITTER DIRECTION // ======================================================================================================== - + glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f ); - for( int y = 2; y < world.h-2; y ++ ) + for( int i = 0; i < world.tile_special_count; i ++ ) { - for( int x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; - if( cell->state & FLAG_CANAL && cell->state & FLAG_TARGETED && cell->config == k_cell_type_split ) - { - glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), x, y, 1.0f ); - draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 ); - } + if( cell->state & FLAG_TARGETED && cell->config == k_cell_type_split ) + { + glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), cmd->pos[0], cmd->pos[1], 1.0f ); + draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 ); } } + + // LIGHT FLARES + // ======================================================================================================== + glBlendFunc(GL_ONE, GL_ONE); + glBlendEquation(GL_FUNC_ADD); + SHADER_USE( shader_sprite ); + + vg_tex2d_bind( &tex_sprites, 0 ); + glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 ); + + for( int i = 0; i < world.tile_special_count; i ++ ) + { + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; + + if( cell->config == k_cell_type_split ) + { + v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f }; + + v3f p0 = { 0.0f, 0.0f, 12.0f }; + v3f p1 = { 0.0f, 0.0f, 12.0f }; + + v2_add( center, (v2f){ -0.25f, -0.25f }, p0 ); + v2_add( center, (v2f){ 0.25f, -0.25f }, p1 ); + + if( cell->state & FLAG_FLIP_FLOP ) + render_sprite( k_sprite_flare_y, p1 ); + else + render_sprite( k_sprite_flare_b, p0 ); + } + } + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendEquation(GL_FUNC_ADD); + // I/O ARRAYS // ======================================================================================================== //glEnable(GL_BLEND); - + SHADER_USE( shader_tile_colour ); + for( int i = 0; i < arrlen( world.io ); i ++ ) { struct cell_terminal *term = &world.io[ i ]; + + if( pcell(term->pos)->state & FLAG_EMITTER ) + continue; + int is_input = pcell(term->pos)->state & FLAG_INPUT; v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; @@ -2781,385 +3228,97 @@ void vg_render(void) */ } -static ui_colourset flcol_list_a = { - .main = 0xff877979, - .hover = 0xffa09393, - .active = 0xffbfb1b0 -}; -static ui_colourset flcol_list_b = { - .main = 0xff7c6e6e, - .hover = 0xffa09393, - .active = 0xffbfb1b0 -}; - -static ui_colourset flcol_list_complete_a = { - .main = 0xff62a064, - .hover = 0xff8dc18f, - .active = 0xffb2ddb3 -}; - -static ui_colourset flcol_list_complete_b = { - .main = 0xff79b37b, - .hover = 0xff8dc18f, - .active = 0xffb2ddb3 -}; - -static ui_colourset flcol_list_locked = { - .main = 0xff655959, - .hover = 0xff655959, - .active = 0xff655959 -}; - -static struct +void vg_ui(void) { - SteamLeaderboard_t steam_leaderboard; - int leaderboard_show; - - struct leaderboard_player - { - // Internal - u64_steamid id; - i32 score; - int is_local_player; - - // To be displayed - char score_text[ 16 ]; - char player_name[ 48 ]; - GLuint texture; // Not dynamic - } - leaderboard_players[10]; - int leaderboard_count; - - struct + if( world.st.state == k_game_state_settings ) { - struct cmp_level *level; - - i32 score; - int is_waiting; - } - upload_request; - - struct cmp_level *level_selected; -} -ui_data; + gui_group_id( 35 ); -void vg_ui(void) -{ - /* - // UI memory - static int pack_selection = 0; - static struct pack_info - { - struct cmp_level *levels; - u32 level_count; - const char *name; - } - pack_infos[] = - { - { - .levels = cmp_levels_tutorials, - .level_count = vg_list_size(cmp_levels_tutorials), - .name = "Training" - }, - { - .levels = cmp_levels_basic, - .level_count = vg_list_size(cmp_levels_basic), - .name = "Main" - }, - { - .levels = cmp_levels_grad, - .level_count = vg_list_size(cmp_levels_tutorials), - .name = "Expert" - } - }; - - // UI Code - ui_global_ctx.cursor[0] = 0; - ui_global_ctx.cursor[1] = 0; - ui_global_ctx.cursor[2] = 256; + ui_global_ctx.cursor[2] = 225; + gui_fill_y(); + gui_align_right(); - gui_fill_y(); - - ui_global_ctx.id_base = 4 << 16; - - gui_new_node(); - { - gui_capture_mouse( 9999 ); - gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d ); - - gui_text( "ASSIGNMENTS", 32, 0 ); - - ui_global_ctx.cursor[1] += 30; - ui_global_ctx.cursor[3] = 25; - gui_new_node(); { - ui_rect_pad( ui_global_ctx.cursor, 2 ); - ui_global_ctx.cursor[2] = 84; - - for( int i = 0; i < 3; i ++ ) - { - int pack_is_unlocked = pack_infos[i].levels[0].unlocked; - - if( i == pack_selection || !pack_is_unlocked ) - gui_override_colours( &flcol_list_locked ); - - if( gui_button( 2000 + i ) == k_button_click && pack_is_unlocked ) - pack_selection = i; - - ui_global_ctx.cursor[1] += 2; - gui_text( pack_is_unlocked? pack_infos[i].name: "???", 24, 0 ); - gui_end_right(); - - gui_reset_colours(); - } - } - gui_end_down(); - - ui_global_ctx.cursor[3] = 500; - - // DRAW LEVEL SELECTION LIST - { - struct cmp_level *levels = pack_infos[ pack_selection ].levels; - int count = pack_infos[ pack_selection ].level_count; - - static struct ui_scrollbar sb = { - .bar_height = 400 - }; - - ui_px view_height = ui_global_ctx.cursor[3]; - ui_px level_height = 50; + gui_capture_mouse( 200 ); - // Level scroll view - gui_new_node(); - { - gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d ); - gui_set_clip( ui_global_ctx.cursor ); - - ui_global_ctx.cursor[2] = 14; - gui_align_right(); - - ui_px content_height = count*level_height; - if( content_height > view_height ) - { - ui_scrollbar( &ui_global_ctx, &sb, 1 ); - ui_global_ctx.cursor[1] -= ui_calculate_content_scroll( &sb, content_height ); - } - else - { - gui_fill_rect( ui_global_ctx.cursor, 0xff807373 ); - } - - ui_global_ctx.cursor[2] = 240; - ui_global_ctx.cursor[3] = level_height; - gui_align_left(); - - for( int i = 0; i < count; i ++ ) - { - struct cmp_level *lvl_info = &levels[i]; - - if( lvl_info->unlocked ) - { - if( lvl_info->completed_score != 0 ) - gui_override_colours( i&0x1? &flcol_list_complete_a: &flcol_list_complete_b ); - else - gui_override_colours( i&0x1? &flcol_list_a: &flcol_list_b ); - } - else - gui_override_colours( &flcol_list_locked ); - - if( lvl_info->unlocked ) - { - if( gui_button( 2 + i ) == k_button_click ) - { - ui_data.level_selected = &levels[i]; - ui_data.leaderboard_show = 0; - - if( pack_selection >= 1 ) - sw_find_leaderboard( ui_data.level_selected->map_name ); - } - - ui_global_ctx.override_colour = 0xffffffff; - gui_text( lvl_info->title, 24, 0 ); - ui_global_ctx.cursor[1] += 18; - gui_text( lvl_info->completed_score>0? "passed": "incomplete", 24, 0 ); - } - else - { - gui_button( 2 + i ); - - ui_global_ctx.override_colour = 0xff786f6f; - gui_text( "???", 24, 0 ); - ui_global_ctx.cursor[1] += 18; - gui_text( "locked", 24, 0 ); - } - - gui_end_down(); - } - - gui_reset_colours(); - gui_release_clip(); - } - gui_end_down(); - } - } - gui_end_right(); - - // Selected level UI - // ============================================================ - - if( ui_data.level_selected ) - { - ui_global_ctx.cursor[0] += 16; - ui_global_ctx.cursor[1] += 16; - ui_global_ctx.cursor[2] = 512-40; - ui_global_ctx.cursor[3] = 560-16; - - gui_new_node(); - { - gui_capture_mouse( 9999 ); - - gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d ); - ui_global_ctx.cursor[1] += 4; - gui_text( ui_data.level_selected->title, 24, 0 ); - - ui_global_ctx.cursor[1] += 30; + gui_fill_rect( ui_global_ctx.cursor, 0xC0202020 ); ui_rect_pad( ui_global_ctx.cursor, 8 ); - ui_global_ctx.cursor[3] = 300; - - gui_new_node(); - { - gui_fill_rect( ui_global_ctx.cursor, 0xff655959 ); - } - gui_end_down(); - //ui_text_use_paragraph( &ui_global_ctx ); - ui_global_ctx.cursor[1] += 2; - - gui_text( ui_data.level_selected->description, 16, 0 ); - //ui_text_use_title( &ui_global_ctx ); - - // Buttons at the bottom ui_global_ctx.cursor[3] = 25; - ui_global_ctx.cursor[2] = 80; - gui_align_bottom(); - ui_global_ctx.cursor[1] -= 8; - - if( gui_button( 3000 ) == k_button_click ) + gui_new_node(); { - ui_data.level_selected = NULL; + gui_text( "Settings", 3 ); } - gui_text( "BACK", 24, k_text_alignment_center ); gui_end(); - - gui_align_right(); - ui_global_ctx.cursor[2] = 170; - ui_global_ctx.cursor[0] -= 8 + 170 + 2; - - { - gui_override_colours( &flcol_list_locked ); - if( gui_button( 3001 ) == k_button_click ) - vg_error( "UNIMPLEMENTED\n" ); - - ui_global_ctx.override_colour = 0xff888888; - - gui_text( "RESTORE SOLUTION", 24, k_text_alignment_center ); - gui_end_right(); - ui_global_ctx.override_colour = 0xffffffff; - } - - ui_global_ctx.cursor[0] += 2; - ui_global_ctx.cursor[2] = 80; - + + // Colour scheme selection + ui_global_ctx.cursor[1] += 30; + + gui_text( "Colour Scheme", 2 ); + ui_global_ctx.cursor[1] += 25; + + gui_new_node(); { - gui_override_colours( &flcol_list_complete_a ); - if( gui_button( 3002 ) == k_button_click ) + ui_global_ctx.cursor[2] = 50; + + for( int i = 0; i < 4; i ++ ) { - if( console_changelevel( 1, &ui_data.level_selected->map_name ) ) + gui_new_node(); { - world.pCmpLevel = ui_data.level_selected; + // Convert to RGB + u32 rgb = 0xff000000; + + for( int j = 0; j < 3; j ++ ) + rgb |= (u32)(colour_sets[ colour_set_id ][i][j]*255.0f) << j * 8; - ui_data.level_selected = NULL; - ui_data.leaderboard_show = 0; + gui_fill_rect( ui_global_ctx.cursor, rgb ); } + gui_end_right(); } - gui_text( "PLAY", 24, k_text_alignment_center ); - gui_end(); - } - - gui_reset_colours(); - } - gui_end_right(); - - if( ui_data.leaderboard_show ) - { - ui_global_ctx.cursor[0] += 16; - ui_global_ctx.cursor[2] = 350; - ui_global_ctx.cursor[3] = 25; - - // If has results - gui_new_node(); - { - gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d ); - gui_text( "FRIEND LEADERBOARD", 24, 0 ); } gui_end_down(); - ui_global_ctx.cursor[1] += 2; - gui_new_node(); { - ui_global_ctx.cursor[3] = 32+8; + ui_global_ctx.cursor[2] = 25; + if( gui_button( 0 ) == k_button_click ) + { + if( colour_set_id > 0 ) + colour_set_id --; + } + gui_text( "<", 2 ); + gui_end_right(); - for( int i = 0; i < ui_data.leaderboard_count; i ++ ) + ui_global_ctx.cursor[2] = 150; + gui_new_node(); { - gui_new_node(); - { - gui_fill_rect( ui_global_ctx.cursor, i&0x1? flcol_list_a.main: flcol_list_b.main ); + ui_global_ctx.cursor[0] += 45; + ui_global_ctx.cursor[1] += 6; + gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 2 ); + } + gui_end_right(); - ui_global_ctx.cursor[0] += 4; - ui_global_ctx.cursor[1] += 4; - - // 1,2,3 ... - static const char *places[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" }; - gui_text( places[i], 24, 0 ); - ui_global_ctx.cursor[0] += 32; - - struct leaderboard_player *player = &ui_data.leaderboard_players[i]; - - // Players image - ui_global_ctx.cursor[2] = 32; - ui_global_ctx.cursor[3] = 32; - - gui_new_node(); - { - gui_push_image( ui_global_ctx.cursor, player->texture ); - } - gui_end_right(); - - // Players name - gui_text( player->player_name, 24, 0 ); - - ui_global_ctx.cursor[2] = 50; - gui_align_right(); - - gui_text( player->score_text, 24, k_text_alignment_right ); - } - gui_end_down(); - - ui_global_ctx.cursor[1] += 2; + ui_global_ctx.cursor[2] = 25; + if( gui_button( 1 ) == k_button_click ) + { + if( colour_set_id < vg_list_size( colour_sets )-1 ) + colour_set_id ++; } + gui_text( ">", 2 ); + gui_end_down(); } - gui_end(); + gui_end_down(); } + gui_end(); } - */ } +#if STEAM_LEADERBOARDS void leaderboard_dispatch_score(void) { -#if STEAM_LEADERBOARDS + sw_upload_leaderboard_score( ui_data.upload_request.level->steam_leaderboard, k_ELeaderboardUploadScoreMethodKeepBest, @@ -3171,12 +3330,10 @@ void leaderboard_dispatch_score(void) ui_data.upload_request.is_waiting = 0; vg_success( "Dispatched leaderboard score\n" ); -#endif } void leaderboard_found( LeaderboardFindResult_t *pCallback ) { -#ifdef STEAM_LEADERBOARDS if( !pCallback->m_bLeaderboardFound ) { vg_error( "Leaderboard could not be found\n" ); @@ -3206,12 +3363,10 @@ void leaderboard_found( LeaderboardFindResult_t *pCallback ) } } } -#endif } void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback ) { -#ifdef STEAM_LEADERBOARDS // Update UI if this leaderboard matches what we currently have in view if( ui_data.level_selected->steam_leaderboard == pCallback->m_hSteamLeaderboard ) { @@ -3246,12 +3401,10 @@ void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback ) ui_data.leaderboard_show = 0; } else vg_warn( "Downloaded leaderboard does not match requested!\n" ); -#endif } void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ) { -#ifdef STEAM_LEADERBOARDS if( ui_data.upload_request.is_waiting ) vg_warn( "You are uploading leaderboard entries too quickly!\n" ); @@ -3264,8 +3417,8 @@ void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ) leaderboard_dispatch_score(); else sw_find_leaderboard( cmp_level->map_name ); -#endif } +#endif // CONSOLE COMMANDS // =========================================================================================================== @@ -3277,6 +3430,8 @@ static int console_credits( int argc, char const *argv[] ) 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 JustFredrik\n" ); + vg_info( " Ubuntu Regular ubuntu.com\n" ); return 0; } @@ -3365,8 +3520,10 @@ static int console_changelevel( int argc, char const *argv[] ) { // Save current level console_save_map( 0, NULL ); + if( console_load_map( argc, argv ) ) { + world.st.zoom = 0.0f; simulation_stop(); return 1; } @@ -3413,6 +3570,22 @@ void vg_start(void) .function = console_credits }); + vg_convar_push( (struct vg_convar){ + .name = "colours", + .data = &colour_set_id, + .data_type = k_convar_dtype_i32, + .opt_i32 = { .min = 0, .max = 2, .clamp = 1 }, + .persistent = 1 + }); + + vg_convar_push( (struct vg_convar){ + .name = "theme", + .data = &world_theme_id, + .data_type = k_convar_dtype_i32, + .opt_i32 = { .min = 0, .max = vg_list_size( world_themes )-1, .clamp = 1 }, + .persistent = 1, + }); + // Combined quad, long quad / empty circle / filled circle mesh { float combined_mesh[6*6 + 32*6*3] = { @@ -3527,18 +3700,20 @@ void vg_start(void) } resource_load_main(); - + // Create text buffers { // Work out the counts for each 'segment' u32 desc_max_size = 0, title_max_size = 0, score_max_size = 10, - time_max_size = 10 + time_max_size = 10, + + size_level_texts = 6*9*7 ; - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) { struct cmp_level *lvl = &set->pack[j]; @@ -3553,7 +3728,8 @@ void vg_start(void) title_max_size + desc_max_size + score_max_size + - time_max_size; + time_max_size + + size_level_texts; u32 total_faces = total_characters * 2, total_vertices = total_characters * 4, @@ -3561,7 +3737,8 @@ void vg_start(void) // Working buffer u32 work_buffer_total_chars = - VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) ); + VG_MAX( 7, VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) ) ); + u32 total_work_faces = work_buffer_total_chars * 2, total_work_vertices = work_buffer_total_chars * 4, total_work_indices = total_work_faces * 3; @@ -3570,12 +3747,14 @@ void vg_start(void) text_buffers.desc_count = 0; text_buffers.score_count = 0; text_buffers.time_count = 0; + text_buffers.grid_count = size_level_texts; // Calculate offsets text_buffers.title_start = 0; - text_buffers.desc_start = title_max_size; + text_buffers.desc_start = text_buffers.title_start + title_max_size; text_buffers.score_start = text_buffers.desc_start + desc_max_size; text_buffers.time_start = text_buffers.score_start + score_max_size; + text_buffers.grid_start = text_buffers.time_start + time_max_size; // Opengl glGenVertexArrays(1, &text_buffers.vao); @@ -3608,6 +3787,32 @@ void vg_start(void) // Offline memory text_buffers.buffer = (struct vector_glyph_vert *)malloc( total_work_vertices * sizeof(struct vector_glyph_vert) ); text_buffers.indices = (u16*)malloc( total_work_indices * sizeof(u16) ); + + char label[8]; + for( int i = 1; i < 7; i ++ ) + label[i] = ' '; + label[7] = 0x00; + + // Reset grid + for( int x = 0; x < 6; x ++ ) + { + for( int y = 0; y < 9; y ++ ) + { + label[0] = ' '; + + if( x == 0 ) + { + if( y != 8 ) + label[0] = 'A' + y; + } + else if( y == 8 ) + { + label[0] = '0' + x; + } + + gen_text_buffer( label, &font_Ubuntu, (v2f){ -6.0f + x + (x == 0? 0.6f: 0.2f), y + 0.2f }, 0.35f, text_buffers.grid_start+(y*6+x)*7 ); + } + } } // Restore gamestate @@ -3617,7 +3822,10 @@ void vg_start(void) void vg_free(void) { +#ifdef VG_STEAM sw_free_opengl(); +#endif + console_save_map( 0, NULL ); career_serialize();