X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=4f6564407990d6346ac91320bd051036dd836309;hb=0de25596501d8aba67b08c92bdab417d6947cd13;hp=f22789e0b1540c932da5c12c4c4c94e2af6cc996;hpb=a1741ec4aed057cbafff2d6bc9e5cf8a15ae322b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/menu.h b/menu.h
index f22789e..4f65644 100644
--- a/menu.h
+++ b/menu.h
@@ -7,7 +7,8 @@
 #include "player.h"
 
 #include "shaders/menu.h"
-#include "vg/vg_steam_friends.h"
+#include "vg_steam_friends.h"
+#include "submodules/tinydir/tinydir.h"
 
 VG_STATIC mdl_context menu_model;
 VG_STATIC glmesh      menu_glmesh;
@@ -17,13 +18,11 @@ VG_STATIC float       menu_input_cooldown = 0.0f;
 VG_STATIC float       menu_fov_target = 97.0f;
 VG_STATIC v2f         menu_extra_angles;
 
-VG_STATIC int         menu_loc = 0xb,
-                      menu_loc_last = 1;
-VG_STATIC u32         menu_page     = 0;
-
 VG_STATIC int         cl_menu         = 0,
                       cl_menu_go_away = 0;
 
+VG_STATIC int         menu_enabled(void){ return cl_menu; }
+
 VG_STATIC const char *playermodels[] = { "ch_new", "ch_jordan", "ch_outlaw" };
 
 vg_tex2d tex_menu = { .path = "textures/menu.qoi",.flags = VG_TEXTURE_NEAREST };
@@ -32,52 +31,194 @@ VG_STATIC struct input_binding input_menu_h,
                                input_menu_v,
                                input_menu_press,
                                input_menu_back,
-                               input_menu_toggle;
+                               input_menu_toggle,
+                               input_menu_toggle_kbm;
 
-VG_STATIC void menu_btn_paused( int event );
 VG_STATIC void menu_btn_quit( int event );
 VG_STATIC void menu_btn_skater( int event );
-VG_STATIC void menu_btn_map( int event );
-VG_STATIC void menu_btn_map_a( int event );
-VG_STATIC void menu_btn_map_b( int event );
-VG_STATIC void menu_btn_map_c( int event );
+VG_STATIC void menu_btn_blur( int event );
 VG_STATIC void menu_btn_fuckoff( int event );
 VG_STATIC void menu_btn_reset( int event );
+VG_STATIC void menu_btn_map( int event );
+VG_STATIC void menu_btn_settings( int event );
+
+VG_STATIC mdl_node *menu_pnode_fov_slider,
+                   *menu_pnode_fov_min,
+                   *menu_pnode_fov_max,
+                   *menu_pnode_vol_slider,
+                   *menu_pnode_vol_min,
+                   *menu_pnode_vol_max;
+
+struct
+{
+   /* state */
+   int loc;
+   u32 page;
+
+   /* map browser */
+   struct menu_map_file
+   {
+      char name[ 64 ];
+   }
+   maps_list[ 16 ];
+
+   int selected_map,
+       map_count;
+}
+VG_STATIC game_menu;
+
+enum menu_page
+{
+   k_menu_page_main     = 0x1,
+   k_menu_page_skater   = 0x2,
+   k_menu_page_quit     = 0x4,
+   k_menu_page_settings = 0x8,
+   k_menu_page_map      = 0x10
+};
+
+struct menu_btn_userdata
+{
+   int   i;
+   void *ptr_generic;
+};
+
+VG_STATIC int menu_settings_if( struct menu_btn_userdata ud )
+{
+   if( game_menu.page & k_menu_page_settings )
+   {
+      int *ptr = ud.ptr_generic;
+      return *ptr;
+   }
+   else
+      return 0;
+}
+
+VG_STATIC int menu_vis( struct menu_btn_userdata ud )
+{
+   if( ud.i & game_menu.page )
+      return 1;
+   else
+      return 0;
+}
+
+VG_STATIC int menu_controller( struct menu_btn_userdata ud )
+{
+   if( (game_menu.page & (k_menu_page_main|k_menu_page_settings)) 
+         && (ud.i == menu_display_controller) )
+      return 1;
+   return 0;
+}
+
+VG_STATIC int menu_controller_inf( struct menu_btn_userdata ud )
+{
+   if( (game_menu.page & k_menu_page_settings) 
+        && (ud.i == menu_display_controller) )
+      return 1;
+   return 0;
+}
 
 struct menu_button
 {
    const char *name;
-   u32 areas;
 
-   void (*fn_press)(int event);
-   int links[4];
-   mdl_node *pnode;
+   int (*fn_visibility)( struct menu_btn_userdata ud );
+   struct menu_btn_userdata user;
+
+   void (*fn_press)( int event );
+
+   const char *ll,
+              *lu,
+              *lr,
+              *ld;
 
+   mdl_node *pnode;
    float falpha, fsize;
 }
 VG_STATIC menu_buttons[] = 
 {
-/*0*/{"text_paused",     1, menu_btn_paused },
-/*1*/{"text_quit",       9, menu_btn_quit,    {3,-1,4,0xb}},
-/*2*/{"text_skater",     3, menu_btn_skater,  {3,0xb,4,-1}},
-/*3*/{"text_map",        5, NULL, {-1,-1,2,-1}},
-/*4*/{"text_about_game", 1, NULL, {2,-1,-1,-1}},
-/*5*/{"skater_left",     2, NULL, {-1,-1,-1,-1}},
-/*6*/{"skater_right",    2, NULL, {-1,-1,-1,-1}},
-/*7*/{"g_map",           5, NULL },
-/*8*/{"g_controls",      1, NULL },
-/*9*/{"text_quitty",     8, NULL },
-/*a*/{"text_yes",        8, menu_btn_fuckoff,{-1,-1,-1,-1} },
-/*b*/{"text_reset",      1, menu_btn_reset,{3,1,4,2} },
+   { 
+      "text_quit", menu_vis, {.i=k_menu_page_main|k_menu_page_quit},   
+      .fn_press = menu_btn_quit,
+         .ld="text_reset", .lr="text_settings", .ll="text_map"
+   },
+   {
+      "text_quitty", menu_vis, {.i=k_menu_page_quit}
+   },
+   {
+      "text_yes", menu_vis, {.i=k_menu_page_quit},
+         .fn_press = menu_btn_fuckoff
+   },
+{
+   "text_reset", menu_vis, {.i=k_menu_page_main},
+   .fn_press = menu_btn_reset,
+      .lu="text_quit", .ld="text_skater", .ll="text_map", .lr="text_settings"
+},
+{  
+   "text_skater", menu_vis, {.i=k_menu_page_main|k_menu_page_skater}, 
+   .fn_press = menu_btn_skater,
+      .lu="text_reset", .ll="text_map", .lr="text_settings"
+},
+{
+   "text_map", menu_vis, {.i=k_menu_page_main},
+   .fn_press = menu_btn_map,
+      .lr="text_reset"
+},
+{
+   "text_settings", menu_vis, {.i=k_menu_page_main|k_menu_page_settings},
+   .fn_press = menu_btn_settings,
+      .ll="text_reset"
+},
+{
+   "skater_left", menu_vis, {k_menu_page_skater}
+},
+{
+   "skater_right", menu_vis, {k_menu_page_skater}
+},
+
+{ 
+   "fov_slider",     menu_vis, {k_menu_page_settings},
+   .ld="text_blur" 
+},
+{ "fov_info",        menu_vis, {k_menu_page_settings} },
+
+{ 
+   "vol_slider",     menu_vis, {k_menu_page_settings},
+   .lu="text_blur"
+},
+{ "vol_info",        menu_vis, {k_menu_page_settings} },
+
+{ 
+   "text_blur",      menu_vis, {k_menu_page_settings},
+   .fn_press = menu_btn_blur, 
+   .lu="fov_slider", .ld="vol_slider"
+},
+{
+   "text_blur_check", menu_settings_if, {.ptr_generic=&cl_blur} 
+},
+
+{ "ctr_xbox",        menu_controller_inf, {k_menu_controller_type_xbox}},
+{ "ctr_xbox_text",   menu_controller_inf, {k_menu_controller_type_xbox}},
+{ "ctr_steam",       menu_controller_inf, {k_menu_controller_type_steam}},
+{ "ctr_steam_text",  menu_controller_inf, {k_menu_controller_type_steam}},
+{ "ctr_deck",        menu_controller_inf, {k_menu_controller_type_steam_deck}},
+{ "ctr_deck_text",   menu_controller_inf, {k_menu_controller_type_steam_deck}},
+{ "ctr_ps",          menu_controller_inf, {k_menu_controller_type_playstation}},
+{ "ctr_ps_text",     menu_controller_inf, {k_menu_controller_type_playstation}},
+{ "ctr_kbm",         menu_controller_inf, {k_menu_controller_type_keyboard}},
+{ "ctr_kbm_text",    menu_controller_inf, {k_menu_controller_type_keyboard}},
+{
+   "text_paused", menu_vis, {k_menu_page_main} 
+},
 };
 
-VG_STATIC void menu_btn_map_a( int event ){}
-VG_STATIC void menu_btn_map_b( int event ){}
-VG_STATIC void menu_btn_map_c( int event ){}
-
-VG_STATIC void menu_btn_paused( int event )
+VG_STATIC int menu_get_loc( const char *loc )
 {
+   for( int i=0; i<vg_list_size(menu_buttons); i++ )
+      if( !strcmp( menu_buttons[i].name, loc ) )
+         return i;
 
+   assert(0);
+   return 0;
 }
 
 VG_STATIC void menu_btn_reset( int event )
@@ -86,31 +227,103 @@ VG_STATIC void menu_btn_reset( int event )
    world_routes_clear();
 
    cl_menu_go_away = 1;
-   menu_page = 0;
+   game_menu.page = 0;
 }
 
 VG_STATIC void menu_btn_fuckoff( int event )
 {
-   glfwSetWindowShouldClose( vg.window, 1 );
+   vg.window_should_close = 1;
 }
 
 VG_STATIC void menu_btn_quit( int event )
 {
-   menu_page = 0x8;
-   menu_loc = 0xa;
+   game_menu.page = k_menu_page_quit;
+   game_menu.loc = menu_get_loc( "text_yes" );
 }
 
-VG_STATIC void menu_btn_map( int event )
+VG_STATIC void menu_btn_settings( int event )
 {
-   menu_page = 0x4;
-   menu_loc = 7;
+   game_menu.page = k_menu_page_settings;
+   game_menu.loc = menu_get_loc( "fov_slider" );
 }
 
 VG_STATIC void menu_btn_skater( int event )
 {
-   menu_page = 0x2;
+   game_menu.page = k_menu_page_skater;
+}
+
+VG_STATIC void menu_btn_blur( int event )
+{
+   cl_blur ^= 0x1;
+}
+
+VG_STATIC void menu_btn_map( int event )
+{
+   game_menu.page = k_menu_page_map;
+   game_menu.map_count = 0;
+   game_menu.selected_map = 0;
+
+   tinydir_dir dir;
+   tinydir_open( &dir, "maps" );
+
+   while( dir.has_next )
+   {
+      tinydir_file file;
+      tinydir_readfile( &dir, &file );
+      
+      if( file.is_reg )
+      {
+         struct menu_map_file *mf = &game_menu.maps_list[ game_menu.map_count ];
+         
+         vg_strncpy( file.name, mf->name, 
+                                vg_list_size(game_menu.maps_list[0].name)-1 );
+
+         game_menu.map_count ++;
+         if( game_menu.map_count == vg_list_size(game_menu.maps_list) )
+            break;
+      }
+
+      tinydir_next( &dir );
+   }
+
+   tinydir_close(&dir);
 }
 
+VG_STATIC void menu_crap_ui(void)
+{
+   if( cl_menu && (game_menu.page == k_menu_page_map) )
+   {
+      ui_rect box;
+      box[0] = vg.window_x/2 - 150;
+      box[1] = vg.window_y/2 - 300;
+      box[2] = 300;
+      box[3] = 600;
+
+      ui_fill_rect( box, 0xa0000000 );
+
+      if( game_menu.map_count == 0 )
+      {
+         ui_text( (ui_rect){ vg.window_x/2, box[1]+8, 0,0 }, "No maps found", 1,
+                  k_text_align_center );
+      }
+      else
+      {
+         ui_rect_pad( box, 4 );
+         box[3] = 16;
+
+         for( int i=0; i<game_menu.map_count; i++ )
+         {
+            struct menu_map_file *mf = &game_menu.maps_list[ i ];
+
+            ui_fill_rect( box, game_menu.selected_map == i? 0xa0ffffff:
+                                                            0xa0808080 );
+            ui_text( (ui_rect){ vg.window_x/2, box[1]+2, 0,0 },
+                                 mf->name, 1, k_text_align_center );
+            box[1] += 16+4;
+         }
+      }
+   }
+}
 
 VG_STATIC void steam_on_game_overlay( CallbackMsg_t *msg )
 {
@@ -120,7 +333,8 @@ VG_STATIC void steam_on_game_overlay( CallbackMsg_t *msg )
    if( inf->m_bActive )
    {
       cl_menu = 1;
-      menu_page = 1;
+      game_menu.page = k_menu_page_main;
+      game_menu.loc = menu_get_loc( "text_skater" );
    }
 }
 
@@ -131,16 +345,19 @@ VG_STATIC void menu_init(void)
    vg_create_unnamed_input( &input_menu_back, k_input_type_button );
    vg_create_unnamed_input( &input_menu_press, k_input_type_button );
    vg_create_unnamed_input( &input_menu_toggle, k_input_type_button );
+   vg_create_unnamed_input( &input_menu_toggle_kbm, k_input_type_button );
 
    vg_apply_bind_str( &input_menu_h, "", "gp-ls-h" );
-   vg_apply_bind_str( &input_menu_h, "+", "d" );
-   vg_apply_bind_str( &input_menu_h, "-", "a" );
-   vg_apply_bind_str( &input_menu_v, "", "gp-ls-v" );
-   vg_apply_bind_str( &input_menu_v, "+", "w" );
-   vg_apply_bind_str( &input_menu_v, "-", "s" );
+   vg_apply_bind_str( &input_menu_h, "+", "right" );
+   vg_apply_bind_str( &input_menu_h, "-", "left" );
+   vg_apply_bind_str( &input_menu_v, "", "-gp-ls-v" );
+   vg_apply_bind_str( &input_menu_v, "+", "up" );
+   vg_apply_bind_str( &input_menu_v, "-", "down" );
    vg_apply_bind_str( &input_menu_press, "", "gp-a" );
+   vg_apply_bind_str( &input_menu_press, "", "\2enter" );
    vg_apply_bind_str( &input_menu_back, "", "gp-b" );
-   vg_apply_bind_str( &input_menu_toggle, "", "\2escape" );
+   vg_apply_bind_str( &input_menu_back, "", "\2escape" );
+   vg_apply_bind_str( &input_menu_toggle_kbm, "", "\2escape" );
    vg_apply_bind_str( &input_menu_toggle, "", "\2gp-menu" );
 
    vg_linear_clear( vg_mem.scratch );
@@ -148,6 +365,7 @@ VG_STATIC void menu_init(void)
    mdl_open( &menu_model, "models/rs_menu.mdl" );
    mdl_load_metadata( &menu_model, vg_mem.rtmemory );
    mdl_load_mesh_data( &menu_model, vg_mem.scratch );
+   mdl_invert_uv_coordinates( &menu_model );
    mdl_close( &menu_model );
 
    vg_acquire_thread_sync();
@@ -163,9 +381,19 @@ VG_STATIC void menu_init(void)
       btn->pnode = mdl_node_from_name( &menu_model, btn->name );
 
       if( !btn->pnode )
+      {
+         vg_info( "info: %s\n", btn->name );
          vg_fatal_exit_loop( "Menu programming error" );
+      }
    }
 
+   menu_pnode_fov_max = mdl_node_from_name( &menu_model, "fov_slider_max" );
+   menu_pnode_fov_min = mdl_node_from_name( &menu_model, "fov_slider_min" );
+   menu_pnode_fov_slider = mdl_node_from_name( &menu_model, "fov_slider" );
+   menu_pnode_vol_max = mdl_node_from_name( &menu_model, "vol_slider_max" );
+   menu_pnode_vol_min = mdl_node_from_name( &menu_model, "vol_slider_min" );
+   menu_pnode_vol_slider = mdl_node_from_name( &menu_model, "vol_slider" );
+
    shader_menu_register();
 
 #ifdef SR_NETWORKED
@@ -175,7 +403,7 @@ VG_STATIC void menu_init(void)
 
 VG_STATIC void menu_run_directional(void)
 {
-   struct menu_button *btn = &menu_buttons[ menu_loc ];
+   struct menu_button *btn = &menu_buttons[ game_menu.loc ];
 
    if( vg_input_button_down( &input_menu_press ) )
    {
@@ -192,30 +420,27 @@ VG_STATIC void menu_run_directional(void)
 
    if( menu_input_cooldown <= 0.0f )
    {
-      v2f dir = { input_menu_h.axis.value,
-                  input_menu_v.axis.value };
+      v2f dir = {  input_menu_h.axis.value,
+                  -input_menu_v.axis.value };
 
       if( v2_length2( dir ) > 0.8f*0.8f )
       {
-         int idir = 0;
+         const char *link = NULL;
 
          if( fabsf(dir[0]) > fabsf(dir[1]) )
          {
-            if( dir[0] > 0.0f ) idir = 2;
-            else idir = 0;
+            if( dir[0] > 0.0f ) link = btn->lr;
+            else link = btn->ll;
          }
          else
          {
-            if( dir[1] > 0.0f ) idir = 3;
-            else idir = 1;
+            if( dir[1] > 0.0f ) link = btn->ld;
+            else link = btn->lu;
          }
 
-         int link = btn->links[idir];
-
-         if( link != -1 )
+         if( link )
          {
-            menu_loc_last = menu_loc;
-            menu_loc = link;
+            game_menu.loc = menu_get_loc( link );
             menu_input_cooldown = 0.25f;
          }
       }
@@ -230,7 +455,8 @@ VG_STATIC int menu_page_should_backout(void)
 VG_STATIC void menu_close(void)
 {
    cl_menu_go_away = 1;
-   menu_page = 0;
+   game_menu.page = 0;
+   game_menu.loc = menu_get_loc( "text_skater" );
 }
 
 VG_STATIC void menu_page_main(void)
@@ -249,20 +475,60 @@ VG_STATIC void menu_page_map(void)
 {
    if( menu_page_should_backout() )
    {
-      menu_page = 1;
-      menu_loc = 3;
+      game_menu.page = k_menu_page_main;
+      game_menu.loc = menu_get_loc( "text_map" );
+   }
+
+   if( game_menu.map_count > 0 )
+   {
+      float v = input_menu_v.axis.value;
+      if( (fabsf(v) > 0.7f) && (menu_input_cooldown <= 0.0f) )
+      {
+         audio_lock();
+         audio_play_oneshot( &audio_rewind[4], 1.0f );
+         audio_unlock();
+
+         if( v > 0.0f )
+         {
+            game_menu.selected_map --;
+
+            if( game_menu.selected_map < 0 )
+               game_menu.selected_map = game_menu.map_count-1;
+
+            menu_input_cooldown = 0.25f;
+         }
+         else
+         {
+            game_menu.selected_map ++;
+
+            if( game_menu.selected_map >= game_menu.map_count )
+               game_menu.selected_map = 0;
+
+            menu_input_cooldown = 0.25f;
+         }
+      }
+
+      if( vg_input_button_down( &input_menu_press ) )
+      {
+         /* load map */
+         char temp[256];
+         strcpy( temp, "maps/" );
+         strcat( temp, game_menu.maps_list[game_menu.selected_map].name );
+
+         world_change_world( 1, (const char *[]){ temp } );
+         menu_close();
+      }
    }
 
    menu_fov_target = 80.0f;
-   menu_run_directional();
 }
 
 VG_STATIC void menu_page_quit(void)
 {
    if( menu_page_should_backout() )
    {
-      menu_page = 1;
-      menu_loc = 1;
+      game_menu.page = k_menu_page_main;
+      game_menu.loc = menu_get_loc( "text_quit" );
    }
 
    menu_fov_target = 90.0f;
@@ -276,8 +542,8 @@ VG_STATIC void menu_page_skater(void)
 
    if( menu_page_should_backout() )
    {
-      menu_page = 1;
-      menu_loc = 2;
+      game_menu.page = k_menu_page_main;
+      game_menu.loc = menu_get_loc( "text_skater" );
       return;
    }
 
@@ -293,8 +559,10 @@ VG_STATIC void menu_page_skater(void)
          if( cl_playermdl_id < 0 )
             cl_playermdl_id = 2;
 
-         menu_buttons[5].fsize = 0.4f;
-         menu_buttons[5].falpha = 1.0f;
+         int li = menu_get_loc( "skater_left" );
+
+         menu_buttons[li].fsize = 0.4f;
+         menu_buttons[li].falpha = 1.0f;
 
          menu_input_cooldown = 0.25f;
       }
@@ -304,14 +572,55 @@ VG_STATIC void menu_page_skater(void)
          if( cl_playermdl_id > 2 )
             cl_playermdl_id = 0;
          
-         menu_buttons[6].fsize = 0.4f;
-         menu_buttons[6].falpha = 1.0f;
+         int ri = menu_get_loc( "skater_left" );
+
+         menu_buttons[ri].fsize = 0.4f;
+         menu_buttons[ri].falpha = 1.0f;
 
          menu_input_cooldown = 0.25f;
       }
    }
 }
 
+VG_STATIC void menu_slider( float *value, int set_value,
+                            mdl_node *slider, mdl_node *pmin, mdl_node *pmax )
+{
+   if( set_value )
+   {
+      float h = input_menu_h.axis.value;
+      if( fabsf(h) > 0.04f )
+         *value += h * vg.frame_delta;
+      *value = vg_clampf( *value, 0.0f, 1.0f );
+   }
+
+   v3_lerp( pmin->co, pmax->co, *value, slider->co );
+}
+
+VG_STATIC void menu_page_settings(void)
+{
+   menu_run_directional();
+
+   int fov_select = game_menu.loc == menu_get_loc( "fov_slider" );
+   menu_slider( &cl_fov, fov_select,
+                  menu_pnode_fov_slider, menu_pnode_fov_min,
+                  menu_pnode_fov_max );
+
+   if( fov_select )
+      menu_fov_target = vg_lerpf( 97.0f, 135.0f, cl_fov ) * 0.8f;
+
+   menu_slider( &vg_audio.volume_console, 
+                  (game_menu.loc == menu_get_loc( "vol_slider" )),
+                  menu_pnode_vol_slider, menu_pnode_vol_min,
+                  menu_pnode_vol_max );
+
+   if( menu_page_should_backout() )
+   {
+      game_menu.page = k_menu_page_main;
+      game_menu.loc = menu_get_loc( "text_settings" );
+      return;
+   }
+}
+
 VG_STATIC void menu_update(void)
 {
    vg_input_update( 1, &input_menu_h );
@@ -319,31 +628,46 @@ VG_STATIC void menu_update(void)
    vg_input_update( 1, &input_menu_back );
    vg_input_update( 1, &input_menu_press );
    vg_input_update( 1, &input_menu_toggle );
+   vg_input_update( 1, &input_menu_toggle_kbm );
 
-   if( vg_input_button_down( &input_menu_toggle ) )
+   int toggle_gp = vg_input_button_down( &input_menu_toggle ),
+       toggle_kb = vg_input_button_down( &input_menu_toggle_kbm ),
+       wait_for_a_sec = 0;
+
+   if( toggle_gp || toggle_kb )
    {
       if( cl_menu )
       {
-         cl_menu_go_away = 1;
-         menu_page = 0;
+         if( toggle_gp )
+         {
+            menu_close();
+         }
       }
       else
       {
+         if( toggle_kb )
+            wait_for_a_sec = 1;
+
          cl_menu = 1;
-         menu_page = 1;
+         game_menu.page = 1;
       }
    }
 
-   if( menu_page == 1 )
-      menu_page_main();
-   else if( menu_page == 2 )
-      menu_page_skater();
-   else if( menu_page == 4 )
-      menu_page_map();
-   else if( menu_page == 8 )
-      menu_page_quit();
+   if( !wait_for_a_sec && cl_menu )
+   {
+      if( game_menu.page == k_menu_page_main )
+         menu_page_main();
+      else if( game_menu.page == k_menu_page_skater )
+         menu_page_skater();
+      else if( game_menu.page == k_menu_page_quit )
+         menu_page_quit();
+      else if( game_menu.page == k_menu_page_settings )
+         menu_page_settings();
+      else if( game_menu.page == k_menu_page_map )
+         menu_page_map();
+   }
 
-   struct menu_button *btn = &menu_buttons[ menu_loc ];
+   struct menu_button *btn = &menu_buttons[ game_menu.loc ];
 
    v3f pos;
    v2f angles;
@@ -401,12 +725,17 @@ VG_STATIC void menu_update(void)
    }
    
    /* Update camera */
+#if 0
    {
-      camera_angles[0] = vg_alerpf( camera_angles[0], angles[0], menu_opacity );
-      camera_angles[1] = vg_lerpf ( camera_angles[1], angles[1], menu_opacity );
-      v3_lerp( camera_pos, pos, menu_opacity, camera_pos );
-      camera_update();
+      main_camera.angles[0] = 
+         vg_alerpf( main_camera.angles[0], angles[0], menu_opacity );
+      main_camera.angles[1] = 
+         vg_lerpf ( main_camera.angles[1], angles[1], menu_opacity );
+      v3_lerp( main_camera.pos, pos, menu_opacity, main_camera.pos );
+
+      camera_update_transform( &main_camera );
    }
+#endif
 
    float dt = vg.frame_delta * 6.0f;
    menu_opacity = vg_lerpf( menu_opacity, cl_menu&&!cl_menu_go_away, dt );
@@ -432,15 +761,15 @@ float expSustainedImpulse( float x, float f, float k )
     return fminf( x*x/(f*f), 1.0f+(2.0f/f)*s*expf(-k*s));
 }
 
-VG_STATIC void menu_render( m4x4f projection )
+VG_STATIC void menu_render( camera *cam )
 {
    glEnable(GL_BLEND);
    glDisable(GL_DEPTH_TEST);
    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
    glBlendEquation(GL_FUNC_ADD);
 
-   shader_fscolour_use();
-   shader_fscolour_uColour( (v4f){ 0.1f, 0.1f, 0.3f, menu_opacity*0.5f } );
+   shader_blitcolour_use();
+   shader_blitcolour_uColour( (v4f){ 0.1f, 0.1f, 0.3f, menu_opacity*0.5f } );
    render_fsquad();
 
    glEnable( GL_DEPTH_TEST );
@@ -453,15 +782,16 @@ VG_STATIC void menu_render( m4x4f projection )
    shader_menu_uTexMain( 1 );
    vg_tex2d_bind( &tex_menu, 1 );
 
-   shader_menu_uPv( projection );
+   shader_menu_uPv( cam->mtx.pv );
+   shader_menu_uPvmPrev( cam->mtx_prev.pv );
    mesh_bind( &menu_glmesh );
 
    for( int i=0; i<vg_list_size(menu_buttons); i++ )
    {
       struct menu_button *btn = &menu_buttons[i];
-      float talpha = i==menu_loc? 1.0f: 0.0f,
-            tsize0 = btn->areas & menu_page? 1.0f: 0.0f,
-            tsize1 = i==menu_loc? 0.07f: 0.0f,
+      float talpha = i==game_menu.loc? 1.0f: 0.0f,
+            tsize0 = btn->fn_visibility( btn->user )? 1.0f: 0.0f,
+            tsize1 = i==game_menu.loc? 0.07f: 0.0f,
             tsize  = tsize0+tsize1;
 
       btn->falpha = vg_lerpf( btn->falpha, talpha, vg.frame_delta * 14.0f );