X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=210797b5c349a80eed80d0e14e03f1bcf51a46a3;hb=8cb8f5f155460ca783ecc9d5edc29f924a1f3238;hp=d7b887d2f602bc62b0a7a2f03cb9af134a8e0cd6;hpb=8d6933e028c4040933b575547e780d13080e0d0e;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index d7b887d..210797b 100644 --- a/fishladder.c +++ b/fishladder.c @@ -1,10 +1,36 @@ // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved -#define VG_STEAM +//#define VG_CAPTURE_MODE +//#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 + // CONSTANTS // =========================================================================================================== @@ -35,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_wire_mode = 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 @@ -129,8 +162,51 @@ struct mesh u32 elements; }; -struct world +struct { + GLuint vao; + GLuint vbo; + GLuint ebo; + + u32 + title_start, title_count, + desc_start, desc_count, + score_start, score_count, + time_start, time_count, + grid_start, grid_count + ; + + #pragma pack(push,1) + struct vector_glyph_vert + { + v2f co; + v2f uv; + + u32 colour; + } + *buffer; + #pragma pack(pop) + + u16 *indices; +} +text_buffers; + +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 { @@ -142,9 +218,7 @@ struct world *data; #pragma pack(pop) - int initialzed; - int sim_run, max_runs; int sim_frame, sim_target; @@ -171,18 +245,11 @@ struct world v2i pos; //int id; } - *io; - - struct cell_button - { - float light_target, light; - int pressed; - } - buttons[4]; + *io; int w, h; - struct mesh shapes, numbers; + struct mesh shapes; struct mesh_wire { GLuint vao, vbo, ebo; @@ -212,7 +279,6 @@ struct world int num_fishes; char map_name[64]; - //struct career_level *ptr_career_level; struct cmp_level *pCmpLevel; u32 score; @@ -222,16 +288,94 @@ 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 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 ); +static int cell_interactive( v2i co ); + +void vg_update(void); +static void render_tiles( 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 // =========================================================================================================== @@ -239,27 +383,39 @@ 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 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 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; } } @@ -343,15 +499,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 @@ -480,6 +627,95 @@ 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 ) +{ + u32 count = 0; + + v2f cursor; + v2f invUv; + v2_copy( origin, cursor ); + + float invScale = (size / (float)font->size); + 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[0] = origin[0]; + } + else if( c >= 32 && c <= 126 ) + { + struct sdf_char *pch = &font->characters[ c - ' ' ]; + struct vector_glyph_vert *vt = &text_buffers.buffer[ count * 4 ]; + u16 *ind = &text_buffers.indices[ count * 6 ]; + + // Emit quad + v2f p0; v2f uv0; + v2f p1; v2f uv1; + + v2_muladds( cursor, (v2f){ pch->originX, -pch->originY }, -invScale, p0 ); + v2_muladds( p0, (v2f){ pch->w, -pch->h }, invScale, p1 ); + + v2_mul( (v2f){ pch->uvx, pch->uvy }, invUv, uv0 ); + v2_muladd( uv0, (v2f){ pch->w, pch->h }, invUv, uv1 ); + + v2_copy( p0, vt[0].co ); + v2_copy( uv0, vt[0].uv ); + vt[0].colour = 0xffffffff; + + v2_copy( (v2f){ p0[0], p1[1] }, vt[1].co ); + v2_copy( (v2f){ uv0[0], uv1[1] }, vt[1].uv ); + vt[1].colour = 0xffffffff; + + v2_copy( p1, vt[2].co ); + v2_copy( uv1, vt[2].uv ); + vt[2].colour = 0xffffffff; + + v2_copy( (v2f){ p1[0], p0[1] }, vt[3].co ); + v2_copy( (v2f){ uv1[0], uv0[1] }, vt[3].uv ); + vt[3].colour = 0xffffffff; + + // Emit indices + 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 ++; + } + } + + glBindVertexArray( text_buffers.vao ); + + glBindBuffer( GL_ARRAY_BUFFER, text_buffers.vbo ); + glBufferSubData( GL_ARRAY_BUFFER, + start*4*sizeof( struct vector_glyph_vert ), + count*4*sizeof( struct vector_glyph_vert ), + text_buffers.buffer + ); + + glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo ); + 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){ -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 ) { //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data @@ -693,12 +929,46 @@ 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; } } + + // Level selection area + + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) + { + struct career_level_pack *grid = &career_packs[ i ]; + + int j = 0; + + for( int y = 0; y < grid->dims[1]; y ++ ) + { + 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 ); + } + } + } + } + + 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; // Random walks.. kinda for( int i = 0; i < arrlen(world.io); i ++ ) @@ -708,6 +978,10 @@ 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]; @@ -801,6 +1075,15 @@ 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; + } + return 1; IL_REG_ERROR: @@ -907,9 +1190,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 ++ ) { @@ -941,13 +1224,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 } } @@ -964,7 +1270,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 @@ -988,9 +1294,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] ); @@ -999,10 +1305,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 ++ ) { @@ -1012,15 +1320,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; - } + 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; } @@ -1028,7 +1338,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) @@ -1039,8 +1349,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; @@ -1066,7 +1376,7 @@ static void simulation_start(void) world.sim_frame = 0; world.sim_run = 0; - world.sim_delta_speed = 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; @@ -1077,6 +1387,11 @@ static void simulation_start(void) clear_animation_flags(); io_reset(); + + if( world.pCmpLevel ) + { + world.pCmpLevel->completed_score = 0; + } } static int world_check_pos_ok( v2i co ) @@ -1169,8 +1484,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 // ======================================================================================================== @@ -1178,16 +1514,34 @@ void vg_update(void) r2 = (float)world.h / (float)world.w, size; - size = ( r2 < r1? (float)world.w * 0.5f: ((float)world.h * 0.5f) / r1 ) + 2.5f; - m3x3_projection( m_projection, -size, size, -size*r1, size*r1 ); + 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; - v3f origin; - origin[0] = floorf( -0.5f * world.w ); + 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 - 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 ); - m3x3_translate( m_view, origin ); + m3x3_translate( m_view, origin_current ); m3x3_mul( m_projection, m_view, vg_pv ); vg_projection_update(); @@ -1198,6 +1552,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() ) @@ -1250,7 +1648,7 @@ void vg_update(void) if( vg_get_button_up("secondary") && world.id_drag_from == world.selected ) { - u32 link_id = local_x > 0.5f? 1: 0; + u32 link_id = cell_ptr->links[ 0 ]? 0: 1; // break existing connection off if( cell_ptr->links[ link_id ] ) @@ -1268,7 +1666,7 @@ void vg_update(void) world.id_drag_from = 0; } - 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) && (cell_ptr->config == k_cell_type_split) ) { 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; @@ -1332,7 +1730,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 ); @@ -1340,6 +1738,9 @@ void vg_update(void) world.sim_target = (int)floorf(world.sim_internal_time); + int success_this_frame = 0; + int failure_this_frame = 0; + while( world.sim_frame < world.sim_target ) { sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 8 ); @@ -1387,7 +1788,16 @@ void vg_update(void) { struct terminal_run *run = &term->runs[ world.sim_run ]; if( run->recv_count < vg_list_size( run->recieved ) ) + { + if( fish->payload == run->conditions[ run->recv_count ] ) + success_this_frame = 1; + else + failure_this_frame = 1; + run->recieved[ run->recv_count ++ ] = fish->payload; + } + else + failure_this_frame = 1; break; } @@ -1498,8 +1908,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; @@ -1564,7 +1976,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; @@ -1585,8 +1997,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 ); @@ -1687,7 +2101,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; @@ -1716,13 +2130,19 @@ void vg_update(void) { career_pass_level( world.pCmpLevel, world.score, 1 ); } + + sfx_set_play( &audio_tones, &audio_system_balls_extra, 9 ); + failure_this_frame = 0; + success_this_frame = 0; } } else { + #ifdef VG_STEAM if( world.sim_run > 0 ) sw_set_achievement( "GOOD_ENOUGH" ); - + #endif + vg_error( "Level failed :(\n" ); } @@ -1733,6 +2153,21 @@ void vg_update(void) world.sim_frame ++; } + // Sounds + if( failure_this_frame ) + { + sfx_set_play( &audio_tones, &audio_system_balls_extra, 0 ); + } + else if( success_this_frame ) + { + static int succes_counter = 0; + + sfx_set_play( &audio_tones, &audio_system_balls_extra, 1+(succes_counter++) ); + + if( succes_counter == 7 ) + succes_counter = 0; + } + // Position update // ===================================================================================================== @@ -1818,9 +2253,6 @@ void vg_update(void) } } -void leaderboard_found( LeaderboardFindResult_t *pCallback ); -void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback ); - static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour ) { v2i full_start = { 0,0 }; @@ -1870,131 +2302,120 @@ static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f cons } } -/* -static void draw_numbers( v3f coord, int number ) +static int world_button_exec( struct world_button *btn, v2f texture, v3f colour, enum world_button_status *status ) { - v3f pos; - v3_copy( coord, pos ); - int digits[8]; int i = 0; - - while( number > 0 && i < 8 ) - { - digits[i ++] = number % 10; - number = number / 10; + static v2i click_grab = { -9999, -9999 }; + + // Reset click_grab + if( !btn ) + { + click_grab[0] = -9999; + click_grab[1] = -9999; + return 0; } + + 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; - for( int j = 0; j < i; j ++ ) + // Process click action + if( is_hovering ) { - glUniform3fv( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 1, pos ); - draw_mesh( MESH_NUMBERS_OFFSETS[digits[i-j-1]][0], MESH_NUMBERS_OFFSETS[digits[i-j-1]][1] ); - pos[0] += pos[2] * 0.75f; + 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; + } } -}*/ -static void wbutton_run( enum e_world_button btn_name ) + // Drawing stage + v4f final_colour; + + 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 ); + + return triggered; +} + +static void level_selection_buttons(void) { - static v3f button_colours[] = { - {0.204f, 0.345f, 0.553f}, - {0.204f, 0.345f, 0.553f}, - {0.741f, 0.513f, 0.078f}, - {1.0f, 0.0f, 0.0f} - }; + v3f tutorial_colour = { 0.204f, 0.345f, 0.553f }; + v3f locked_colour = { 0.2f, 0.2f, 0.2f }; - struct cell_button *btn = &world.buttons[btn_name]; - - // Interaction - - 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 ) + struct cmp_level *switch_level_to = NULL; + + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - // Click event - if( btn_name == k_world_button_sim ) + struct career_level_pack *grid = &career_packs[i]; + + for( int j = 0; j < grid->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; + struct cmp_level *lvl = &grid->pack[ j ]; - 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 ) + 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 + )) { - float time_frac = world.sim_internal_time-floorf(world.sim_internal_time); - world.pause_offset_target = 0.5f - time_frac; + if( status == k_world_button_on_enable && lvl->unlocked ) + switch_level_to = lvl; } - else - world.pause_offset_target = 0.0f; - } - else - { - btn->pressed ^= 0x1; } - - sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 ); } - // Drawing - if( btn->pressed ) + if( switch_level_to ) { - if( is_hovering ) - { - btn->light_target = 0.9f; - } - else + 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 ) ) { - 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; + world.pCmpLevel = switch_level_to; + gen_level_text( world.pCmpLevel ); } + */ } - 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 - - 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_name, - 3.0f - ); - glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour ); - - draw_mesh( 0, 2 ); } void vg_render(void) @@ -2014,6 +2435,9 @@ void vg_render(void) int const empty_start = circle_base+32; int const empty_count = circle_base+32*2; + if( !world.initialzed ) + return; + // BACKGROUND // ======================================================================================================== use_mesh( &world.shapes ); @@ -2031,7 +2455,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 @@ -2045,6 +2470,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); @@ -2067,7 +2493,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 ++ ) { @@ -2194,9 +2620,89 @@ void vg_render(void) vg_tex2d_bind( &tex_buttons, 0 ); glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 ); - wbutton_run( k_world_button_sim ); - wbutton_run( k_world_button_pause ); - //wbutton_run( k_world_button_wire_mode ); + 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 ); + + // TEXT ELEMENTS + // ======================================================================================================== + SHADER_USE( shader_sdf ); + glBindVertexArray( text_buffers.vao ); + glUniformMatrix3fv( SHADER_UNIFORM( shader_sdf, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); + + 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 // ======================================================================================================== @@ -2447,380 +2953,94 @@ 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", 8, 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: "???", 4, 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, 6, 0 ); - ui_global_ctx.cursor[1] += 18; - gui_text( lvl_info->completed_score>0? "passed": "incomplete", 4, 0 ); - } - else - { - gui_button( 2 + i ); - - ui_global_ctx.override_colour = 0xff786f6f; - gui_text( "???", 6, 0 ); - ui_global_ctx.cursor[1] += 18; - gui_text( "locked", 4, 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, 6, 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, 5, 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", 6, 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", 6, 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", 6, 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", 6, 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], 7, 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, 7, 0 ); - - ui_global_ctx.cursor[2] = 50; - gui_align_right(); - - gui_text( player->score_text, 7, 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) { sw_upload_leaderboard_score( @@ -2922,6 +3142,7 @@ void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ) else sw_find_leaderboard( cmp_level->map_name ); } +#endif // CONSOLE COMMANDS // =========================================================================================================== @@ -2933,6 +3154,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; } @@ -3021,8 +3244,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; } @@ -3044,8 +3269,10 @@ static int console_changelevel( int argc, char const *argv[] ) void vg_start(void) { // Steamworks callbacks + #ifdef STEAM_LEADERBOARDS sw_leaderboard_found = &leaderboard_found; sw_leaderboard_downloaded = &leaderboard_downloaded; + #endif vg_function_push( (struct vg_cmd){ .name = "_map_write", @@ -3067,6 +3294,14 @@ 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 + }); + // Combined quad, long quad / empty circle / filled circle mesh { float combined_mesh[6*6 + 32*6*3] = { @@ -3108,19 +3343,6 @@ void vg_start(void) init_mesh( &world.shapes, combined_mesh, vg_list_size( combined_mesh ) ); } - // Numbers mesh - { - init_mesh( &world.numbers, - MESH_NUMBERS_BUFFER, - vg_list_size( MESH_NUMBERS_BUFFER ) - ); - - for( int i = 0; i < 10; i ++ ) - { - vg_info( "offset: %u, length: %u\n", MESH_NUMBERS_OFFSETS[i][0], MESH_NUMBERS_OFFSETS[i][1] ); - } - } - // Create wire mesh { int const num_segments = 64; @@ -3194,6 +3416,120 @@ 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, + + size_level_texts = 6*9*7 + ; + + 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 ++ ) + { + struct cmp_level *lvl = &set->pack[j]; + + desc_max_size = VG_MAX( desc_max_size, strlen( lvl->description ) ); + title_max_size = VG_MAX( title_max_size, strlen( lvl->title ) ); + } + } + + // Full buffer + u32 total_characters = + title_max_size + + desc_max_size + + score_max_size + + time_max_size + + size_level_texts; + + u32 total_faces = total_characters * 2, + total_vertices = total_characters * 4, + total_indices = total_faces * 3; + + // Working buffer + u32 work_buffer_total_chars = + 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; + + text_buffers.title_count = 0; + 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 = 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); + glGenBuffers( 1, &text_buffers.vbo ); + glGenBuffers( 1, &text_buffers.ebo ); + glBindVertexArray( text_buffers.vao ); + + glBindBuffer( GL_ARRAY_BUFFER, text_buffers.vbo ); + glBufferData( GL_ARRAY_BUFFER, total_vertices * sizeof( struct vector_glyph_vert ), NULL, GL_DYNAMIC_DRAW ); + + glBindVertexArray( text_buffers.vao ); + + glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo ); + glBufferData( GL_ELEMENT_ARRAY_BUFFER, total_indices * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW ); + + u32 const stride = sizeof( struct vector_glyph_vert ); + + // XY + glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, stride, (void *)offsetof( struct vector_glyph_vert, co ) ); + glEnableVertexAttribArray( 0 ); + + // UV + glVertexAttribPointer( 1, 2, GL_FLOAT, GL_FALSE, stride, (void *)offsetof( struct vector_glyph_vert, uv ) ); + glEnableVertexAttribArray( 1 ); + + // COLOUR + glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct vector_glyph_vert, colour ) ); + glEnableVertexAttribArray( 2 ); + + // 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 career_local_data_init(); @@ -3202,10 +3538,20 @@ void vg_start(void) void vg_free(void) { +#ifdef VG_STEAM sw_free_opengl(); +#endif + console_save_map( 0, NULL ); career_serialize(); + glDeleteVertexArrays( 1, &text_buffers.vao ); + glDeleteBuffers( 1, &text_buffers.vbo ); + glDeleteBuffers( 1, &text_buffers.ebo ); + + free( text_buffers.buffer ); + free( text_buffers.indices ); + resource_free_main(); glDeleteTextures( 1, &world.background_data ); @@ -3216,7 +3562,6 @@ void vg_free(void) glDeleteBuffers( 1, &world.wire.ebo ); free_mesh( &world.shapes ); - free_mesh( &world.numbers ); map_free(); }