switch to vgc system
[fishladder.git] / fishladder.c
index aca4e406459415dd19ea0edba5a49d063a8807de..f82cebeea04de390e963e0df4d29b14b172d786a 100644 (file)
@@ -1,7 +1,7 @@
 // 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
 #include "vg/vg.h"
 
@@ -68,7 +68,8 @@ enum e_world_button
 enum e_game_state
 {
        k_game_state_main,
-       k_game_state_settings
+       k_game_state_settings,
+   k_game_state_update
 };
 
 #define FLAG_CANAL             0x1
@@ -121,7 +122,7 @@ static struct cell_description
 cell_descriptions[] =
 {
        // 0-3
-       {},
+       { .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 },
@@ -166,35 +167,6 @@ struct mesh
        u32 elements;
 };
 
-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
@@ -309,7 +281,8 @@ world =
                        { .mode = k_world_button_mode_toggle },
                        { .mode = k_world_button_mode_toggle },
                        { .mode = k_world_button_mode_toggle } }
-       }
+       },
+   .selected = -1
 };
 
 // Forward declerations
@@ -339,8 +312,7 @@ 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 );
 
@@ -431,16 +403,16 @@ static struct world_theme
 }
 world_themes[] =
 {
-   {
-      "Wood",
-      { 0.89f, 0.8f, 0.7f },
-      &tex_tiles_wood
-   },
    {
       "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 },
@@ -673,117 +645,67 @@ 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 );
-
-   for( int i = 0; i < vg_list_size( pLevel->strings ); i ++ )
+   
+   if( world.pCmpLevel )
    {
-      struct world_string *wstr = &pLevel->strings[i];
-
-      if( wstr->str )
+      for( int i = 0; i < vg_list_size( world.pCmpLevel->strings ); i ++ )
       {
-         ui_px pos[2];
+         struct world_string *wstr = &world.pCmpLevel->strings[i];
 
-         pos[0] = -UI_GLYPH_SPACING_X/2;
+         if( wstr->str )
+         {
+            ui_px pos[2];
 
-         if( wstr->placement == k_placement_bottom )
-            pos[1] = 2*-unit_scale_px;
-         else
-            pos[1] = (world.h-1)*-unit_scale_px -6;
+            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 );
 
-         ui_text( &world.st.world_text, pos, wstr->str, 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 );
 }
 
@@ -1285,6 +1207,7 @@ struct dcareer_state
        struct dlevel_state
        {
                i32 score;
+
                i32 unlocked;
                i32 reserved[2];
        }
@@ -1300,7 +1223,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 ) );
@@ -1317,7 +1240,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;
                }
        }
 
@@ -1336,24 +1259,15 @@ 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 ++ )
@@ -1368,7 +1282,6 @@ static void career_pass_level( struct cmp_level *lvl, int score, int upload )
                }
                
                sw_set_achievement( "MASTER_ENGINEER" );
-               #endif
        }
 }
 
@@ -1433,7 +1346,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;
@@ -1443,10 +1363,13 @@ 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
@@ -1506,6 +1429,7 @@ static void simulation_start(void)
        if( world.pCmpLevel )
        {
                world.pCmpLevel->completed_score = 0;
+      gen_level_text();
        }
 }
 
@@ -1620,7 +1544,7 @@ static void vg_update(void)
                        if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) )
                        {
                                world.pCmpLevel = world.st.lvl_to_load;
-                               gen_level_text( world.pCmpLevel );
+                               gen_level_text();
                        }
 
                        world.st.lvl_to_load = NULL;
@@ -1668,6 +1592,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
        // ========================================================================================================
@@ -2038,9 +1965,7 @@ static 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;
                                                                
@@ -2087,21 +2012,26 @@ static void vg_update(void)
                                                // Spawn new marble
                                                if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED))
                                                {
-                                                       struct fish *fish = &world.fishes[ world.num_fishes ];
-                                                       lcell( cell_current->links[trigger_id], fish->pos );
-
-                                                       fish->state = k_fish_state_soon_alive;
-                                                       fish->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 ++;
-                                                       }
+                     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
                                                {
@@ -2152,9 +2082,7 @@ static 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 );
@@ -2197,14 +2125,19 @@ static void vg_update(void)
                                                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" );
                                                }
                                        }
                                }
@@ -2292,10 +2225,8 @@ static void vg_update(void)
                                }
                                else
                                {
-                                       #ifdef VG_STEAM
                                        if( world.sim_run > 0 )
                                                sw_set_achievement( "GOOD_ENOUGH" );
-                                       #endif
 
                                        vg_error( "Level failed :(\n" );
                                }
@@ -3071,20 +3002,6 @@ void vg_render(void)
 
        // 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) ) );
-       
    // Old style
    m3x3f mvp_text;
    m3x3_identity( mvp_text );
@@ -3279,11 +3196,16 @@ void vg_render(void)
 
                        v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
                        v2_add( center, (v2f){  0.25f, -0.25f }, p1 );
-
-                       if( cell->state & FLAG_FLIP_FLOP )
-                               render_sprite( k_sprite_flare_y, p1 );
-                       else
-                               render_sprite( k_sprite_flare_b, p0 );
+         
+         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 );
                }
        }
 
@@ -3307,10 +3229,67 @@ void vg_render(void)
 void vg_ui(void) 
 {
    // Drawing world name
-   gui_text( (ui_px [2]){ vg_window_x / 2, 4 }, "THIS IS A WORLD NAME", 2, k_text_align_center );
-   gui_text( (ui_px [2]){ vg_window_x / 2, 28 }, "And here is its cool description yo", 1, k_text_align_center );
+   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;
 
-       if( world.st.state == k_game_state_settings )
+      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 );
 
@@ -3368,7 +3347,7 @@ void vg_ui(void)
                                        if( colour_set_id > 0 )
                                                colour_set_id --;
                                }
-                               gui_text( ui_global_ctx.cursor, "<", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, "<", 2, 0 );
                                gui_end_right();
                                
                                ui_global_ctx.cursor[2] = 150;
@@ -3389,7 +3368,7 @@ void vg_ui(void)
                                        if( colour_set_id < vg_list_size( colour_sets )-1 )
                                                colour_set_id ++;
                                }
-                               gui_text( ui_global_ctx.cursor, ">", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, ">", 2, 0 );
                                gui_end_down();
                        }
                        gui_end_down();
@@ -3409,7 +3388,7 @@ void vg_ui(void)
                                        if( world_theme_id > 0 )
                                                world_theme_id --;
                                }
-                               gui_text( ui_global_ctx.cursor, "<", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, "<", 2, 0 );
                                gui_end_right();
                                
                                ui_global_ctx.cursor[2] = 150;
@@ -3429,7 +3408,7 @@ void vg_ui(void)
                                        if( world_theme_id < vg_list_size( world_themes )-1 )
                                                world_theme_id ++;
                                }
-                               gui_text( ui_global_ctx.cursor, ">", 1, 0 );
+                               gui_text( ui_global_ctx.cursor, ">", 2, 0 );
                                gui_end_down();
                        }
                        gui_end_down();
@@ -3553,7 +3532,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( "  Ubuntu Regular            ubuntu.com\n" );
        return 0;
 }
 
@@ -3828,120 +3806,6 @@ void vg_start(void)
       ui_init_context( &world.st.world_text, 15000 );
    }
 
-       // 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();
        career_load();
@@ -3949,20 +3813,9 @@ 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 );