X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=b6fc80be87a9949d9ddcbb98c9a30685ea40941e;hb=3363633178b1eea582304742ad1202487af0feb1;hp=0147e5ca44d007952e6cd01fcd69df69c4e75a79;hpb=d8147792a9d9dbf52d2e816ac4593ccf8532fd70;p=fishladder.git diff --git a/fishladder.c b/fishladder.c index 0147e5c..b6fc80b 100644 --- a/fishladder.c +++ b/fishladder.c @@ -1,5 +1,6 @@ // Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved +#define MARBLE_COMP_VERSION 4 //#define VG_CAPTURE_MODE //#define VG_STEAM #define VG_STEAM_APPID 1218140U @@ -65,6 +66,13 @@ enum e_world_button k_world_button_settings = 3 }; +enum e_game_state +{ + k_game_state_main, + k_game_state_settings, + k_game_state_update +}; + #define FLAG_CANAL 0x1 #define FLAG_IS_TRIGGER 0x2 #define FLAG_RESERVED0 0x4 @@ -73,12 +81,15 @@ 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 #define FLAG_FLIP_ROTATING 0x400 #define FLAG_TARGETED 0x800 +#define FLAG_INPUT_NICE 0x1000 + /* 0000 0 | 0001 1 | 0010 2 | 0011 3 | | | | | @@ -107,27 +118,28 @@ static struct cell_description int is_linear; v2f trigger_pos; + enum sprites_auto_combine_index trigger_sprite; } cell_descriptions[] = { // 0-3 - {}, - { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } }, - { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f } }, - { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.25f } }, + { .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d }, + { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d }, + { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l }, + { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l }, // 4-7 - { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f } }, - { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .is_linear = 1 }, - { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } }, + { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d }, + { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d, .is_linear = 1 }, + { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d }, { .start = { 0, 1 }, .is_special = 1 }, // 8-11 - { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f } }, - { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.75f } }, - { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .is_linear = 1 }, + { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l }, + { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l }, + { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l, .is_linear = 1 }, { }, // 12-15 - { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.75f, 0.75f } }, - { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f } }, + { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u }, + { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u }, { }, { } }; @@ -156,64 +168,42 @@ struct mesh u32 elements; }; -struct +static struct world { - 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; + // Things that are 'static', aka, initialized once + struct + { + struct world_button buttons[4]; + float zoom; + enum e_game_state state; -struct world_static -{ - struct world_button buttons[4]; -} -world_static = -{ - .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 } + struct cmp_level *lvl_to_load; + float lvl_load_time; + + float world_transition; + ui_ctx world_text; } -}; + st; -struct world -{ -#pragma pack(push,1) struct cell { u16 state; u16 links[2]; u8 config; - u8 pad0; + i8 emit[2]; } *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; @@ -229,10 +219,10 @@ struct world { struct terminal_run { - char conditions[8]; - char recieved[8]; + i8 steps[8]; + i8 recieved[8]; - int condition_count, recv_count; + int step_count, recv_count; } runs[8]; @@ -263,18 +253,17 @@ struct world v2i pos; v2i dir; enum e_fish_state state; - char payload; + i8 colour; int flow_reversed; float death_time; 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; @@ -284,6 +273,17 @@ 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 } } + }, + .selected = -1 }; // Forward declerations @@ -292,7 +292,7 @@ struct world // Utility functions // ----------------- -static void colour_code_v3( char const cc, v3f target ); +static void colour_code_v3( i8 cc, v3f target ); static int hash21i( v2i p, u32 umod ); // Mesh functions @@ -311,9 +311,9 @@ static void level_selection_buttons(void); 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 void gen_level_text(void); static int map_load( const char *str, const char *name ); static void map_serialize( FILE *stream ); @@ -331,11 +331,12 @@ static void clear_animation_flags(void); // ------------- static void simulation_stop(void); static void simulation_start(void); -static int world_check_pos_ok( v2i co ); +static int world_check_pos_ok( v2i co, int dist ); 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 ); +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); @@ -369,45 +370,66 @@ m3x3f m_projection; m3x3f m_view; m3x3f m_mdl; -struct world world; - // UTILITY // =========================================================================================================== static int colour_set_id = 0; +static int world_theme_id = 0; -static void colour_code_v3( char const cc, v3f target ) +static v3f colour_sets[][4] = { - static v3f colour_sets[][4] = - { - { { 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 - }, - }; + { { 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 + }, +}; - if( cc >= 'a' && cc <= 'z' ) - { - int id = cc - 'a'; - - if( id < vg_list_size( colour_sets[0] ) ) - { - v3_copy( colour_sets[colour_set_id][ id ], target ); - return; - } - } +static struct world_theme +{ + const char *name; + v3f col_shadow; + + vg_tex2d *tex_tiles; +} +world_themes[] = +{ + { + "Minimal", + { 0.8f, 0.8f, 0.8f }, + &tex_tiles_min + }, + { + "Wood", + { 0.89f, 0.8f, 0.7f }, + &tex_tiles_wood + }, + { + "Lab", + { 0.7f, 0.7f, 0.7f }, + &tex_tiles_lab + } +}; + +static void colour_code_v3( i8 cc, v3f target ) +{ + if( (cc >= 0) && (cc < vg_list_size( colour_sets[0] )) ) + { + v3_copy( colour_sets[colour_set_id][ cc ], target ); + return; + } + vg_error( "Invalid colour code used '%d'\n", (int)cc ); v3_copy( (v3f){0.0f,0.0f,0.0f}, target ); } @@ -496,7 +518,10 @@ static void map_free(void) { arrfree( world.data ); arrfree( world.io ); - + + free( world.cmd_buf_tiles ); + world.cmd_buf_tiles = NULL; + world.w = 0; world.h = 0; world.data = NULL; @@ -524,6 +549,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 }; @@ -555,12 +586,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; } @@ -571,7 +602,7 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) if( cell->state & FLAG_WALL ) height = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ); - config = 0xF; + config = cell->state & FLAG_INPUT_NICE? 0xB: 0xF; } pcell((v2i){x,y})->config = config; @@ -585,7 +616,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); @@ -615,99 +646,72 @@ 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 ) +static void gen_level_text(void) { - 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 ); + // Old style UI. + ui_px const unit_scale_px = 4*UI_GLYPH_SPACING_X; // 4 char per unit + ui_begin( &world.st.world_text, world.w*unit_scale_px, world.h*unit_scale_px ); + + if( world.pCmpLevel ) + { + for( int i = 0; i < vg_list_size( world.pCmpLevel->strings ); i ++ ) + { + struct world_string *wstr = &world.pCmpLevel->strings[i]; + + if( wstr->str ) + { + ui_px pos[2]; + + pos[0] = -UI_GLYPH_SPACING_X/2; + + if( wstr->placement == k_placement_bottom ) + pos[1] = 2*-unit_scale_px; + else + pos[1] = (world.h-1)*-unit_scale_px -6; + + ui_text( &world.st.world_text, pos, wstr->str, 1, k_text_align_left ); + } + } + } + + // re-create level scores + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) + { + struct career_level_pack *set = &career_packs[i]; + + ui_text( &world.st.world_text, + (ui_px [2]){ + set->origin[0]*unit_scale_px, + -(set->origin[1]+set->dims[1]+1)*unit_scale_px + 18 + }, + set->title, 1, k_text_align_left ); + + for( int j = 0; j < set->count; j ++ ) + { + struct cmp_level *lvl = &set->pack[j]; + + if( lvl->completed_score && !lvl->is_tutorial ) + { + char num[10]; + snprintf( num, 9, "%d", lvl->completed_score ); + + ui_text( &world.st.world_text, + (ui_px [2]){ + lvl->btn.position[0]*unit_scale_px + unit_scale_px/2, + -lvl->btn.position[1]*unit_scale_px - unit_scale_px/2 + }, + num, 1, k_text_align_center ); + } + } + } + + //ui_text( &world.st.world_text, (ui_px [2]){ 0, 0 }, "Preview", 1, k_text_align_left ); + + ui_resolve( &world.st.world_text ); } 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 - map_free(); char const *c = str; @@ -760,8 +764,12 @@ static int map_load( const char *str, const char *name ) struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ]; if( (*c >= 'a' && *c <= 'z') || *c == ' ' ) - { - run->conditions[ run->condition_count ++ ] = *c; + { + i8 code = -1; + if( *c != ' ' ) + code = *c - 'a'; + + run->steps[ run->step_count ++ ] = code; } else { @@ -774,7 +782,7 @@ static int map_load( const char *str, const char *name ) } else if( *c == ':' ) { - terminal->runs[ terminal->run_count ].condition_count = 0; + terminal->runs[ terminal->run_count ].step_count = 0; terminal->run_count ++; world.max_runs = vg_max( world.max_runs, terminal->run_count ); } @@ -870,18 +878,28 @@ 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; term->pos[1] = world.h; term->run_count = 1; - term->runs[0].condition_count = 0; + term->runs[0].step_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_INPUT_NICE; else if( *c == '#' ) cell->state = FLAG_WALL; else if( ((u32)*c >= (u32)'A') && ((u32)*c <= (u32)'A'+0xf) ) { @@ -896,8 +914,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; @@ -907,6 +923,27 @@ static int map_load( const char *str, const char *name ) c ++; } + + // Assign emitter codes + 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 ) + { + if( (term->run_count > 0) && (term->runs[0].step_count >= 2) ) + { + cell->emit[0] = term->runs[0].steps[0]; + cell->emit[1] = term->runs[0].steps[1]; + } + else + { + vg_error( "Emitter was not assigned emit values\n" ); + goto IL_REG_ERROR; + } + } + } // Update data texture to fill out the background { @@ -966,12 +1003,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; @@ -1025,7 +1066,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 ] ) { @@ -1053,6 +1095,9 @@ static int map_load( const char *str, const char *name ) } } + // ========================================================== + // Successful load + vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h ); io_reset(); @@ -1061,13 +1106,17 @@ static int map_load( const char *str, const char *name ) world.initialzed = 1; // Setup world button locations - for( int i = 0; i < vg_list_size( world_static.buttons ); i ++ ) + for( int i = 0; i < vg_list_size( world.st.buttons ); i ++ ) { - struct world_button *btn = &world_static.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: @@ -1085,8 +1134,10 @@ static void map_serialize( FILE *stream ) struct cell *cell = pcell( (v2i){ x, y } ); if( cell->state & FLAG_WALL ) fputc( '#', stream ); + else if( cell->state & FLAG_INPUT_NICE ) 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 ); @@ -1113,8 +1164,11 @@ static void map_serialize( FILE *stream ) { struct terminal_run *run = &term->runs[j]; - for( int k = 0; k < run->condition_count; k ++ ) - fputc( run->conditions[k], stream ); + for( int k = 0; k < run->step_count; k ++ ) + { + i8 step = run->steps[k]; + fputc( step == -1? ' ': ('a' + run->steps[k]), stream ); + } if( j < term->run_count-1 ) fputc( ':', stream ); @@ -1154,6 +1208,7 @@ struct dcareer_state struct dlevel_state { i32 score; + i32 unlocked; i32 reserved[2]; } @@ -1169,7 +1224,7 @@ static void career_serialize(void) return; struct dcareer_state encoded; - encoded.version = 2; + encoded.version = MARBLE_COMP_VERSION; encoded.in_map = world.pCmpLevel? world.pCmpLevel->serial_id: -1; memset( encoded.reserved, 0, sizeof( encoded.reserved ) ); @@ -1186,7 +1241,7 @@ static void career_serialize(void) dest->score = lvl->completed_score; dest->unlocked = lvl->unlocked; dest->reserved[0] = 0; - dest->reserved[1] = 0; + dest->reserved[1] = 0; } } @@ -1205,24 +1260,16 @@ static void career_unlock_level( struct cmp_level *lvl ) static void career_pass_level( struct cmp_level *lvl, int score, int upload ) { if( score > 0 ) - { - 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; - } + { + lvl->completed_score = score; + gen_level_text(); - if( lvl->unlock ) career_unlock_level( lvl->unlock ); + 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 ++ ) @@ -1302,7 +1349,14 @@ static void career_load(void) struct dlevel_state *src = &encoded.levels[lvl->serial_id]; if( src->unlocked ) career_unlock_level( lvl ); - if( src->score ) lvl->completed_score = src->score; + if( src->score ) + { + lvl->completed_score = src->score; + + // Apply unlocking to next levels in case there was an update + if( lvl->unlock ) + career_unlock_level( lvl->unlock ); + } if( lvl->serial_id == encoded.in_map ) lvl_to_load = lvl; @@ -1312,17 +1366,20 @@ static void career_load(void) if( console_changelevel( 1, &lvl_to_load->map_name ) ) { world.pCmpLevel = lvl_to_load; - gen_level_text( world.pCmpLevel ); + gen_level_text(); } career_load_success = 1; + + if( encoded.version < MARBLE_COMP_VERSION || 1 ) + world.st.state = k_game_state_update; } // MAIN GAMEPLAY // =========================================================================================================== static int is_simulation_running(void) { - return world_static.buttons[ k_world_button_sim ].state; + return world.st.buttons[ k_world_button_sim ].state; } static void clear_animation_flags(void) @@ -1333,8 +1390,8 @@ static void clear_animation_flags(void) static void simulation_stop(void) { - world_static.buttons[ k_world_button_sim ].state = 0; - world_static.buttons[ k_world_button_pause ].state = 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; @@ -1360,7 +1417,7 @@ static void simulation_start(void) world.sim_frame = 0; world.sim_run = 0; - world.sim_delta_speed = world_static.buttons[ k_world_button_speedy ].state? 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; @@ -1375,22 +1432,32 @@ static void simulation_start(void) if( world.pCmpLevel ) { world.pCmpLevel->completed_score = 0; + gen_level_text(); } } -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 @@ -1447,7 +1514,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)); } @@ -1470,6 +1537,27 @@ static int cell_interactive( v2i co ) 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.st.lvl_to_load = NULL; + } + } + else + { + world.st.world_transition = vg_minf( 1.0f, (vg_time-world.st.lvl_load_time) * 4.0f ); + } + // Camera // ======================================================================================================== @@ -1482,7 +1570,6 @@ static void vg_update(void) static v2f drag_offset = { 0.0f, 0.0f }; static v2f view_point = { 0.0f, 0.0f }; v2f result_view; - static float view_zoom_extra = 0.0f; size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f; @@ -1494,13 +1581,13 @@ static void vg_update(void) // Create and clamp result view v2_add( view_point, drag_offset, result_view ); - result_view[0] = vg_clampf( result_view[0], -view_zoom_extra, view_zoom_extra ); - result_view[1] = vg_clampf( result_view[1], -view_zoom_extra*r1, view_zoom_extra*r1 ); + 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 - view_zoom_extra, vg_time_delta * 6.0f ); + 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 ); @@ -1508,6 +1595,9 @@ static void vg_update(void) m3x3_translate( m_view, origin_current ); m3x3_mul( m_projection, m_view, vg_pv ); vg_projection_update(); + + if( world.st.state == k_game_state_update ) + return; // Mouse input // ======================================================================================================== @@ -1544,15 +1634,15 @@ static void vg_update(void) v2f mview_delta; float rsize; - rsize = size-view_zoom_extra; + 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 ); - view_zoom_extra = vg_clampf( view_zoom_extra + vg_mouse_wheel[1], 0.0f, size - 4.0f ); + world.st.zoom = vg_clampf( world.st.zoom + vg_mouse_wheel[1], 0.0f, size - 4.0f ); // Recalculate new position - rsize = size-view_zoom_extra; + 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 @@ -1571,41 +1661,43 @@ static 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; @@ -1630,7 +1722,8 @@ static 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; @@ -1649,17 +1742,20 @@ static 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 @@ -1694,7 +1790,7 @@ static void vg_update(void) { float old_time = world.sim_internal_time; - if( !world_static.buttons[ k_world_button_pause ].state ) + 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 ); @@ -1717,7 +1813,7 @@ static 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; } @@ -1753,12 +1849,12 @@ static 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 ] ) + if( fish->colour == run->steps[ run->recv_count ] ) success_this_frame = 1; else failure_this_frame = 1; - run->recieved[ run->recv_count ++ ] = fish->payload; + run->recieved[ run->recv_count ++ ] = fish->colour; } else failure_this_frame = 1; @@ -1842,7 +1938,7 @@ static 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 { @@ -1858,7 +1954,7 @@ static 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; @@ -1904,9 +2000,12 @@ static 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 ) @@ -1915,12 +2014,39 @@ static 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)) + { + if( world.num_fishes < vg_list_size( world.fishes ) ) + { + struct fish *fish = &world.fishes[ world.num_fishes ]; + lcell( cell_current->links[trigger_id], fish->pos ); + + fish->state = k_fish_state_soon_alive; + fish->colour = target_peice->emit[ trigger_id ]; + + 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 + vg_warn( "Max marbles exceeded\n" ); + } 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; } } } @@ -1991,29 +2117,34 @@ static void vg_update(void) if( is_input ) { - if( world.sim_frame < term->runs[ world.sim_run ].condition_count ) + if( world.sim_frame < term->runs[ world.sim_run ].step_count ) { - char emit = term->runs[ world.sim_run ].conditions[ world.sim_frame ]; - if( emit == ' ' ) + i8 emit = term->runs[ world.sim_run ].steps[ world.sim_frame ]; + if( emit == -1 ) continue; struct fish *fish = &world.fishes[ world.num_fishes ]; v2i_copy( term->pos, fish->pos ); fish->state = k_fish_state_alive; - fish->payload = emit; + fish->colour = emit; struct cell *cell_ptr = pcell( fish->pos ); if( cell_ptr->config != k_cell_type_stub ) - { - struct cell_description *desc = &cell_descriptions[ cell_ptr->config ]; - - v2i_copy( desc->start, fish->dir ); - fish->flow_reversed = 1; - - world.num_fishes ++; - alive_count ++; + { + if( world.num_fishes < vg_list_size(world.fishes)) + { + struct cell_description *desc = &cell_descriptions[ cell_ptr->config ]; + + v2i_copy( desc->start, fish->dir ); + fish->flow_reversed = 1; + + world.num_fishes ++; + alive_count ++; + } + else + vg_warn( "Max marbles exceeded\n" ); } } } @@ -2026,17 +2157,16 @@ static 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 ]; - if( run->recv_count == run->condition_count ) + if( run->recv_count == run->step_count ) { - for( int j = 0; j < run->condition_count; j ++ ) + for( int j = 0; j < run->step_count; j ++ ) { - if( run->recieved[j] != run->conditions[j] ) + if( run->recieved[j] != run->steps[j] ) { world.completed = 0; break; @@ -2065,7 +2195,7 @@ static void vg_update(void) world.sim_delta_ref = vg_time; world.sim_internal_ref = 0.0f; - if( world_static.buttons[ k_world_button_pause ].state ) + if( world.st.buttons[ k_world_button_pause ].state ) world.pause_offset_target = 0.5f; else world.pause_offset_target = 0.0f; @@ -2217,7 +2347,33 @@ static void vg_update(void) } } -static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour ) +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 uv[2]; + + uv[0] = ptr->config & 0x3; + uv[1] = ptr->config >> 2; + + glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), + (float)pos[0], + (float)pos[1], + 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 ); +} + +// 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 }; @@ -2227,41 +2383,44 @@ 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 ); + } + } +} + +// Renders all tiles in the command list +static void render_tiles( v4f const regular_colour, v4f const selected_colour ) +{ + 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 } + }; + + for( int i = 0; i < vg_list_size( render_lists ); i ++ ) + { + struct render_list *list = &render_lists[i]; + for( int j = 0; j < list->count; j ++ ) + { + struct render_cmd *cmd = &list->arr[j]; + struct cell *cell = cmd->ptr; + + render_tile( cmd->pos, cell, regular_colour, selected_colour ); } } } @@ -2330,186 +2489,66 @@ static int world_button_exec( struct world_button *btn, v2f texture, v3f colour, return triggered; } -/* -static void wbutton_run( enum e_world_button btn_name, v2f btn_tex ) +static void level_selection_buttons(void) { - 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} - }; + 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 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 ) + 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( 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( btn->pressed ) + 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 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; } - - sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 ); } - // Drawing - if( btn->pressed ) + if( switch_level_to ) { - if( is_hovering ) + 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 ) ) { - btn->light_target = 0.9f; + world.pCmpLevel = switch_level_to; + gen_level_text( world.pCmpLevel ); } - 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; - } - } - 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 ) - { - if( world.buttons[ k_world_button_pause ].pressed ) - tex_offset = 3; - else - tex_offset = 2; + */ } - - 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] - ); - glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour ); - - draw_mesh( 0, 2 ); } -static void wbutton_draw( v2i pos, v2f tex, v4f colour ) +static void render_sprite( enum sprites_auto_combine_index id, v3f pos ) { - 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 ); -} -*/ + struct vg_sprite *sp = &sprites_auto_combine[ id ]; -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 cmp_level *switch_level_to = NULL; - - for( int i = 0; i < vg_list_size( career_packs ); i ++ ) - { - struct career_level_pack *grid = &career_packs[i]; - - for( int j = 0; j < grid->count; j ++ ) - { - struct cmp_level *lvl = &grid->pack[ 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; - } - } - } + 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 ); - if( switch_level_to ) - { - if( console_changelevel( 1, &switch_level_to->map_name ) ) - { - world.pCmpLevel = switch_level_to; - gen_level_text( world.pCmpLevel ); - } - } + draw_mesh( 0, 2 ); } void vg_render(void) @@ -2529,8 +2568,41 @@ 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|FLAG_INPUT_NICE) ) + { + struct render_cmd *cmd; + + if( + (cell->config == k_cell_type_split && (cell->state & FLAG_CANAL)) + || (cell->state & (FLAG_EMITTER|FLAG_IS_TRIGGER)) + ) + 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 // ======================================================================================================== @@ -2549,7 +2621,7 @@ 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 ); // (sinf( vg_time ) + 1.0f) * 0.5f ); + glUniform1f( SHADER_UNIFORM( shader_background, "uVisibility" ), 1.0f ); //world.st.world_transition ); draw_mesh( 0, 2 ); @@ -2564,20 +2636,19 @@ 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" ), 2.0f ); // sinf( vg_time ) + 1.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); glBlendEquation(GL_FUNC_ADD); - // Bind textures + // rebind textures vg_tex2d_bind( &tex_tile_data, 0 ); - glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 ); - - vg_tex2d_bind( &tex_wood, 1 ); - glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 ); - - render_tiles( NULL, NULL, colour_default, colour_default ); + vg_tex2d_bind( theme->tex_tiles, 1 ); + + glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uShadowing" ), 1, theme->col_shadow ); + + render_tiles( colour_default, colour_default ); // MARBLES // ======================================================================================================== @@ -2587,7 +2658,7 @@ void vg_render(void) vg_tex2d_bind( &tex_ball_noise, 0 ); glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 ); - if( world_static.buttons[ k_world_button_sim ].state ) + if( world.st.buttons[ k_world_button_sim ].state ) { for( int i = 0; i < world.num_fishes; i ++ ) { @@ -2616,7 +2687,7 @@ void vg_render(void) v2_copy( fish->physics_co, render_pos ); v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; - colour_code_v3( fish->payload, dot_colour ); + colour_code_v3( fish->colour, dot_colour ); glUniform3fv( SHADER_UNIFORM( shader_ball, "uColour" ), 1, dot_colour ); glUniform3fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, render_pos ); @@ -2633,55 +2704,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: 2.0f, + 3.0f + ); + draw_mesh( 0, 2 ); } } @@ -2700,7 +2767,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 ); @@ -2715,15 +2782,15 @@ void vg_render(void) glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 ); enum world_button_status stat; - int world_paused = world_static.buttons[k_world_button_pause].state; - int world_running = world_static.buttons[k_world_button_sim].state; + 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_static.buttons[k_world_button_sim], (v2f){ sim_icon_x, 3.0f }, btn_dark_blue, &stat )) + 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 ) { @@ -2738,7 +2805,7 @@ void vg_render(void) { // Trigger single step world.pause_offset_target += 1.0f; - world_static.buttons[k_world_button_sim].state = 1; + world.st.buttons[k_world_button_sim].state = 1; } else { @@ -2747,7 +2814,7 @@ void vg_render(void) } } - if( world_button_exec( &world_static.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat )) + 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; @@ -2761,7 +2828,7 @@ void vg_render(void) world.pause_offset_target = 0.0f; } - if( world_button_exec( &world_static.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat )) + 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; @@ -2772,182 +2839,51 @@ void vg_render(void) } } - if( world_button_exec( &world_static.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat )) + 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 - // ======================================================================================================== - //glDisable(GL_BLEND); - - SHADER_USE( shader_wire ); - glBindVertexArray( world.wire.vao ); - - glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); - - v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f }; - v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f }; - v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f }; - - glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp ); - glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f ); - if( world.id_drag_from ) - { - glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour ); - glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f ); - glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f ); - glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f ); - glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); - } - - // Pulling animation - float rp_x1 = world.frame_lerp*9.0f; - 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 x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); - - if( cell->state & FLAG_CANAL ) - { - if( cell->state & FLAG_IS_TRIGGER ) - { - struct cell_description *desc = &cell_descriptions[ 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) ); - } - } - } - } - - // WIRE ENDPOINTS + // I/O ARRAYS // ======================================================================================================== + //glEnable(GL_BLEND); SHADER_USE( shader_tile_colour ); 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 x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); - - if( cell->state & FLAG_CANAL ) - { - if( cell->state & FLAG_IS_TRIGGER ) - { - struct cell_description *desc = &cell_descriptions[ 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 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 ); - } - } - } - } - } - - // 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 x = 2; x < world.w-2; x ++ ) - { - struct cell *cell = pcell((v2i){x,y}); - 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 ); - } - } - } - - // I/O ARRAYS - // ======================================================================================================== - - //glEnable(GL_BLEND); - 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; + struct cell *cell = pcell(term->pos); + int is_input = cell->state & FLAG_INPUT; v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f }; + + if( cell->state & FLAG_EMITTER ) + { + for( int j = 0; j < 2; j ++ ) + { + if( cell->emit[j] != -1 ) + { + colour_code_v3( cell->emit[j], dot_colour ); + + glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), + term->pos[0] + 0.25f + (float)j * 0.5f, + term->pos[1] + 0.25f, + 0.12f + ); + + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); + draw_mesh( filled_start, filled_count ); + } + } + continue; + } for( int k = 0; k < term->run_count; k ++ ) { @@ -2986,11 +2922,13 @@ void vg_render(void) if( bar_draw ) { glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, bar_colour ); - glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)term->pos[0], y_position - 0.1f, 1.0f ); + glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), + (float)term->pos[0], y_position - 0.1f, 1.0f ); + draw_mesh( 2, 2 ); } - for( int j = 0; j < term->runs[k].condition_count; j ++ ) + for( int j = 0; j < term->runs[k].step_count; j ++ ) { glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)term->pos[0] + 0.2f + 0.2f * (float)j, @@ -3000,10 +2938,10 @@ void vg_render(void) if( is_input ) { - char cc = term->runs[k].conditions[j]; - if( cc != ' ' ) + i8 colour = term->runs[k].steps[j]; + if( colour != -1 ) { - colour_code_v3( cc, dot_colour ); + colour_code_v3( colour, dot_colour ); glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); // Draw filled if tick not passed, draw empty if empty @@ -3025,7 +2963,7 @@ void vg_render(void) draw_mesh( filled_start, filled_count ); } - colour_code_v3( term->runs[k].conditions[j], dot_colour ); + colour_code_v3( term->runs[k].steps[j], dot_colour ); glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour ); draw_mesh( empty_start, empty_count ); @@ -3033,6 +2971,256 @@ void vg_render(void) } } } + + // 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) || (cell->state & FLAG_EMITTER) ) + { + 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 ); + } + else if( cell->state & FLAG_IS_TRIGGER ) + { + v3f p0 = { 0.0f, 0.0f, 4.0f }; + + struct cell_description *desc = &cell_descriptions[ cell->config ]; + + v2_add( (v2f){ cmd->pos[0], cmd->pos[1] }, desc->trigger_pos, p0 ); + render_sprite( desc->trigger_sprite, p0 ); + } + } + + // TEXT ELEMENTS + // ======================================================================================================== + // Old style + m3x3f mvp_text; + m3x3_identity( mvp_text ); + m3x3_scale( mvp_text, (v3f){ + 1.0f/ ((float)UI_GLYPH_SPACING_X*4.0f), + 1.0f/ -((float)UI_GLYPH_SPACING_X*4.0f), + 1.0f + }); + + m3x3_mul( vg_pv, mvp_text, mvp_text ); + ui_draw( &world.st.world_text, mvp_text ); + + // WIRES + // ======================================================================================================== + glEnable(GL_BLEND); + + SHADER_USE( shader_wire ); + glBindVertexArray( world.wire.vao ); + + glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); + + v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f }; + v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f }; + v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f }; + + glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp ); + glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f ); + + if( world.id_drag_from ) + { + glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour ); + glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f*world.st.world_transition ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f*world.st.world_transition ); + glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); + } + + // Pulling animation + float rp_x1 = world.frame_lerp*9.0f; + float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f; + float rp_x2 = 1.0f-rp_xa; + + 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->state & FLAG_TARGETED ) + { + for( int j = 0; j < 2; j ++ ) + { + 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 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( cmd->ptr->emit[j], 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*world.st.world_transition ); + glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), endpoint[0], endpoint[1], 0.18f*world.st.world_transition ); + glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) ); + } + } + } + + // WIRE ENDPOINTS + // ======================================================================================================== + + SHADER_USE( shader_tile_colour ); + use_mesh( &world.shapes ); + + 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->state & FLAG_TARGETED ) + { + for( int j = 0; j < 2; j ++ ) + { + 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( cell->state & FLAG_EMITTER ) + { + v4f wire_colour; + colour_code_v3( cell->emit[j], wire_colour ); + + v3_muls( wire_colour, 0.8f, wire_colour ); + wire_colour[3] = 1.0f; + + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, wire_colour ); + } + else + glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1,j?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 * world.st.world_transition + ); + 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 i = 0; i < world.tile_special_count; i ++ ) + { + struct render_cmd *cmd = &world.cmd_buf_specials[i]; + struct cell *cell = cmd->ptr; + + 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_TARGETED ) + { + if( cell->state & FLAG_FLIP_FLOP ) + render_sprite( k_sprite_flare_y, p1 ); + else + render_sprite( k_sprite_flare_b, p0 ); + } + else + render_sprite( k_sprite_flare_w, cell->state &FLAG_FLIP_FLOP? p1: p0 ); + } + } + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendEquation(GL_FUNC_ADD); + glDisable(GL_BLEND); @@ -3047,11 +3235,201 @@ void vg_render(void) */ } -void vg_ui(void) {} +void vg_ui(void) +{ + // Drawing world name + if( world.pCmpLevel ) + { + gui_text( (ui_px [2]){ vg_window_x / 2, 4 }, world.pCmpLevel->title, 2, k_text_align_center ); + gui_text( (ui_px [2]){ vg_window_x / 2, 28 }, world.pCmpLevel->description, 1, k_text_align_center ); + } + + if( world.st.state == k_game_state_update ) + { + gui_group_id( 34 ); + + ui_global_ctx.cursor[2] = 458; + ui_global_ctx.cursor[3] = 316; + ui_global_ctx.cursor[0] = vg_window_x / 2 - 229; + ui_global_ctx.cursor[1] = vg_window_y / 2 - 158; + + gui_new_node(); + { + gui_capture_mouse( 200 ); + gui_fill_rect( ui_global_ctx.cursor, 0xE8303030 ); + + ui_px title_pos[2]; + title_pos[0] = ui_global_ctx.cursor[0] + 229; + title_pos[1] = ui_global_ctx.cursor[1] + 16; + + gui_text( title_pos, "Update 1.5", 2, k_text_align_center ); + + gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 16, title_pos[1] + 45 }, + "Welcome to the first update to marble computing!" + "\n" + "New features have been added:\n" + "\n" + " - Settings menu\n" + " - Map skins\n" + " - More levels and a new block type\n" + " - Scores for each level\n" + " - Zooming and panning (mousewheel)\n" + "\n" + "There is much more in the works, such as a\n" + "soundtrack, and the rest of the levels for the\n" + "3 bit computer!\n" + "\n" + "Thank you everyone for enjoying my game :)\n", + 1, k_text_align_left + ); + + ui_global_ctx.cursor[2] = 100; + ui_global_ctx.cursor[3] = 30; + ui_global_ctx.cursor[0] += 229 - 50; + ui_global_ctx.cursor[1] += 316 - 30 - 16; + + if( gui_button( 1 ) ) + { + world.st.state = k_game_state_main; + } + gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 50, + ui_global_ctx.cursor[1] + 4 }, "OK", 1, k_text_align_center ); + gui_end(); + } + gui_end(); + } + else if( world.st.state == k_game_state_settings ) + { + gui_group_id( 35 ); + + ui_global_ctx.cursor[2] = 225; + gui_fill_y(); + gui_align_right(); + + gui_new_node(); + { + gui_capture_mouse( 200 ); + + gui_fill_rect( ui_global_ctx.cursor, 0xC0202020 ); + ui_rect_pad( ui_global_ctx.cursor, 8 ); + + ui_global_ctx.cursor[3] = 25; + + gui_new_node(); + { + gui_text( ui_global_ctx.cursor, "SETTINGS", 2, 0 ); + } + gui_end(); + + // Colour scheme selection + ui_global_ctx.cursor[1] += 30; + + gui_text( ui_global_ctx.cursor, "Colour Scheme", 1, 0 ); + ui_global_ctx.cursor[1] += 25; + + gui_new_node(); + { + ui_global_ctx.cursor[2] = 50; + + for( int i = 0; i < 4; i ++ ) + { + gui_new_node(); + { + // 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; + + gui_fill_rect( ui_global_ctx.cursor, rgb ); + } + gui_end_right(); + } + } + gui_end_down(); + + gui_new_node(); + { + ui_global_ctx.cursor[2] = 25; + if( gui_button( 0 ) == k_button_click ) + { + if( colour_set_id > 0 ) + colour_set_id --; + } + gui_text( ui_global_ctx.cursor, "<", 2, 0 ); + gui_end_right(); + + ui_global_ctx.cursor[2] = 150; + gui_new_node(); + { + gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff ); + gui_text( + (ui_px [2]){ ui_global_ctx.cursor[0] + 75, ui_global_ctx.cursor[1] + 6 }, + (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], + 1, k_text_align_center + ); + } + gui_end_right(); + + 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( ui_global_ctx.cursor, ">", 2, 0 ); + gui_end_down(); + } + gui_end_down(); + + // Theme select + // TODO: remove code dupe + ui_global_ctx.cursor[1] += 16; + + gui_text( ui_global_ctx.cursor, "Tile Theme", 1, 0 ); + ui_global_ctx.cursor[1] += 20; + + gui_new_node(); + { + ui_global_ctx.cursor[2] = 25; + if( gui_button( 0 ) == k_button_click ) + { + if( world_theme_id > 0 ) + world_theme_id --; + } + gui_text( ui_global_ctx.cursor, "<", 2, 0 ); + gui_end_right(); + + ui_global_ctx.cursor[2] = 150; + gui_new_node(); + { + gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff ); + gui_text( + (ui_px [2]){ ui_global_ctx.cursor[0] + 75, ui_global_ctx.cursor[1] + 6 }, + world_themes[ world_theme_id ].name, 1, k_text_align_center + ); + } + gui_end_right(); + + ui_global_ctx.cursor[2] = 25; + if( gui_button( 1 ) == k_button_click ) + { + if( world_theme_id < vg_list_size( world_themes )-1 ) + world_theme_id ++; + } + gui_text( ui_global_ctx.cursor, ">", 2, 0 ); + gui_end_down(); + } + gui_end_down(); + } + gui_end(); + } +} #if STEAM_LEADERBOARDS void leaderboard_dispatch_score(void) { + sw_upload_leaderboard_score( ui_data.upload_request.level->steam_leaderboard, k_ELeaderboardUploadScoreMethodKeepBest, @@ -3163,8 +3541,6 @@ 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; } @@ -3253,8 +3629,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; } @@ -3305,9 +3683,18 @@ void vg_start(void) .name = "colours", .data = &colour_set_id, .data_type = k_convar_dtype_i32, - .opt_i32 = { .min = 0, .max = 2, .clamp = 1 } + .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] = { @@ -3423,120 +3810,11 @@ 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 ); + // Init world text + { + ui_init_context( &world.st.world_text, 15000 ); + } - 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(); career_load(); @@ -3551,13 +3829,6 @@ void vg_free(void) 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 ); @@ -3569,6 +3840,8 @@ void vg_free(void) free_mesh( &world.shapes ); + ui_context_free( &world.st.world_text ); + map_free(); }