X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=1e2b8e7d422f607d432eb0873868c4710f39c722;hb=8c376ed2e4021a18b0a6c6e800109d67ad09d198;hp=bcd614198626e540ab06c4e792960c7b0758161e;hpb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index bcd6141..1e2b8e7 100644 --- a/menu.h +++ b/menu.h @@ -49,13 +49,16 @@ VG_STATIC void menu_btn_settings( int event ); VG_STATIC void menu_btn_invert_y( int event ); VG_STATIC mdl_mesh *menu_mesh_fov_slider, - *menu_mesh_vol_slider; + *menu_mesh_vol_slider, + *menu_mesh_res_slider; VG_STATIC ent_marker *menu_mark_fov_min, *menu_mark_fov_max, *menu_mark_vol_min, - *menu_mark_vol_max; + *menu_mark_vol_max, + *menu_mark_res_min, + *menu_mark_res_max; struct{ /* state */ @@ -107,7 +110,7 @@ VG_STATIC int menu_vis( struct menu_btn_userdata ud ) 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) ) + && (ud.i == steam_display_controller) ) return 1; return 0; } @@ -115,7 +118,7 @@ VG_STATIC int menu_controller( struct menu_btn_userdata ud ) VG_STATIC int menu_controller_inf( struct menu_btn_userdata ud ) { if( (game_menu.page & k_menu_page_settings) - && (ud.i == menu_display_controller) ) + && (ud.i == steam_display_controller) ) return 1; return 0; } @@ -188,7 +191,7 @@ VG_STATIC menu_buttons[] = { "vol_slider", menu_vis, {k_menu_page_settings}, - .lu="text_blur" + .lu="res_slider" }, { "vol_info", menu_vis, {k_menu_page_settings} }, @@ -203,22 +206,28 @@ VG_STATIC menu_buttons[] = { "text_blur", menu_vis, {k_menu_page_settings}, .fn_press = menu_btn_blur, - .lu="text_invert_y", .ld="vol_slider" + .lu="text_invert_y", .ld="res_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}}, +{ + "res_slider", menu_vis, {k_menu_page_settings}, + .ld = "vol_slider", .lu = "text_blur" +}, +{ + "res_info", menu_vis, {k_menu_page_settings}, +}, +{ "ctr_xbox", menu_controller_inf, {k_steam_controller_type_xbox}}, +{ "ctr_xbox_text", menu_controller_inf, {k_steam_controller_type_xbox}}, +{ "ctr_steam", menu_controller_inf, {k_steam_controller_type_steam}}, +{ "ctr_steam_text", menu_controller_inf, {k_steam_controller_type_steam}}, +{ "ctr_deck", menu_controller_inf, {k_steam_controller_type_steam_deck}}, +{ "ctr_deck_text", menu_controller_inf, {k_steam_controller_type_steam_deck}}, +{ "ctr_ps", menu_controller_inf, {k_steam_controller_type_playstation}}, +{ "ctr_ps_text", menu_controller_inf, {k_steam_controller_type_playstation}}, +{ "ctr_kbm", menu_controller_inf, {k_steam_controller_type_keyboard}}, +{ "ctr_kbm_text", menu_controller_inf, {k_steam_controller_type_keyboard}}, { "text_paused", menu_vis, {k_menu_page_main} }, @@ -234,10 +243,9 @@ VG_STATIC int menu_get_loc( const char *loc ) return 0; } -VG_STATIC int __respawn( int argc, const char *argv[] ); VG_STATIC void menu_btn_reset( int event ) { - __respawn(0,NULL); + localplayer_cmd_respawn( 0, NULL ); cl_menu_go_away = 1; game_menu.page = 0; } @@ -404,9 +412,14 @@ VG_STATIC void menu_init(void) ent_find_marker( &menu_model, &menu_markers, "vol_slider_max" ); menu_mark_vol_min = ent_find_marker( &menu_model, &menu_markers, "vol_slider_min" ); + menu_mark_res_max = + ent_find_marker( &menu_model, &menu_markers, "res_slider_max" ); + menu_mark_res_min = + ent_find_marker( &menu_model, &menu_markers, "res_slider_min" ); menu_mesh_fov_slider = mdl_find_mesh( &menu_model, "fov_slider" ); menu_mesh_vol_slider = mdl_find_mesh( &menu_model, "vol_slider" ); + menu_mesh_res_slider = mdl_find_mesh( &menu_model, "res_slider" ); shader_model_menu_register(); @@ -591,7 +604,7 @@ VG_STATIC void menu_slider( float *value, int set_value, if( set_value ){ float h = input_menu_h.axis.value; if( fabsf(h) > 0.04f ) - *value += h * vg.frame_delta; + *value += h * vg.time_frame_delta; *value = vg_clampf( *value, 0.0f, 1.0f ); } @@ -615,6 +628,11 @@ VG_STATIC void menu_page_settings(void) menu_mesh_vol_slider, menu_mark_vol_min->transform.co, menu_mark_vol_max->transform.co ); + menu_slider( &gpipeline.view_render_scale, + (game_menu.loc == menu_get_loc( "res_slider" )), + menu_mesh_res_slider, menu_mark_res_min->transform.co, + menu_mark_res_max->transform.co ); + if( menu_page_should_backout() ){ game_menu.page = k_menu_page_main; game_menu.loc = menu_get_loc( "text_settings" ); @@ -622,8 +640,6 @@ VG_STATIC void menu_page_settings(void) } } -player_instance *tmp_localplayer(void); - VG_STATIC void menu_update(void) { vg_input_update( 1, &input_menu_h ); @@ -669,7 +685,7 @@ VG_STATIC void menu_update(void) /* Base */ { - player_instance *player = tmp_localplayer(); + player_instance *player = &localplayer; struct player_avatar *av = player->playeravatar; v3f center_rough; @@ -713,7 +729,7 @@ VG_STATIC void menu_update(void) m3x3_mul( player->basis, menu_mdl_mtx, menu_mdl_mtx ); menu_smooth_fov = vg_lerpf( menu_smooth_fov, menu_fov_target, - vg.frame_delta * 8.2f ); + vg.time_frame_delta * 8.2f ); } /* Extra */ @@ -724,7 +740,7 @@ VG_STATIC void menu_update(void) float y = atan2f( delta[0], delta[2] ), p = -sinf(delta[1]), - dt = vg.frame_delta; + dt = vg.time_frame_delta; menu_extra_angles[0] = vg_lerpf( menu_extra_angles[0], y, dt ); menu_extra_angles[1] = vg_lerpf( menu_extra_angles[1], p, dt ); @@ -734,7 +750,7 @@ VG_STATIC void menu_update(void) menu_camera_angles[0] = fmodf( menu_camera_angles[0], VG_TAUf ); } - float dt = vg.frame_delta * 6.0f; + float dt = vg.time_frame_delta * 6.0f; menu_opacity = vg_lerpf( menu_opacity, cl_menu&&!cl_menu_go_away, dt ); if( menu_opacity <= 0.01f ){ @@ -745,7 +761,7 @@ VG_STATIC void menu_update(void) vg.time_rate = 1.0-(double)menu_opacity; if( cl_menu ){ - menu_input_cooldown -= vg.frame_delta; + menu_input_cooldown -= vg.time_frame_delta; } } @@ -791,8 +807,8 @@ VG_STATIC void menu_render_fg( camera *cam ) tsize1 = i==game_menu.loc? 0.07f: 0.0f, tsize = tsize0+tsize1; - btn->falpha = vg_lerpf( btn->falpha, talpha, vg.frame_delta * 14.0f ); - btn->fsize = vg_lerpf( btn->fsize, tsize, vg.frame_delta * 7.0f ); + btn->falpha = vg_lerpf( btn->falpha, talpha, vg.time_frame_delta * 14.0f); + btn->fsize = vg_lerpf( btn->fsize, tsize, vg.time_frame_delta * 7.0f ); /* Colour */ v4f vselected = {0.95f*1.3f,0.45f*1.3f,0.095f*1.3f, 1.0f}, @@ -807,7 +823,7 @@ VG_STATIC void menu_render_fg( camera *cam ) mdl_transform_m4x3( &btn->mesh->transform, mtx ); m4x3_mul( menu_mdl_mtx, mtx, mtx ); m4x3_identity( mtx_size ); - m4x3_scale( mtx_size, expSustainedImpulse( btn->fsize, 0.5f, 8.7f) ); + m3x3_scalef( mtx_size, expSustainedImpulse( btn->fsize, 0.5f, 8.7f) ); m4x3_mul( mtx, mtx_size, mtx ); shader_model_menu_uMdl( mtx );