X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=6612494a8492a899c8733878b68d32a4599459ec;hb=1f7014d965883820f984877b8ca15c1e439cf9cf;hp=1e2b8e7d422f607d432eb0873868c4710f39c722;hpb=8c376ed2e4021a18b0a6c6e800109d67ad09d198;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index 1e2b8e7..6612494 100644 --- a/menu.h +++ b/menu.h @@ -9,7 +9,6 @@ #include "shaders/model_menu.h" #include "vg_steam_friends.h" -#include "submodules/tinydir/tinydir.h" VG_STATIC mdl_context menu_model; VG_STATIC mdl_array_ptr menu_markers; @@ -30,14 +29,16 @@ 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 }; +GLuint tex_menu; +#if 0 VG_STATIC struct input_binding input_menu_h, input_menu_v, input_menu_press, input_menu_back, input_menu_toggle, input_menu_toggle_kbm; +#endif VG_STATIC void menu_btn_quit( int event ); VG_STATIC void menu_btn_skater( int event ); @@ -107,6 +108,7 @@ VG_STATIC int menu_vis( struct menu_btn_userdata ud ) return 0; } +#if 0 VG_STATIC int menu_controller( struct menu_btn_userdata ud ) { if( (game_menu.page & (k_menu_page_main|k_menu_page_settings)) @@ -122,6 +124,7 @@ VG_STATIC int menu_controller_inf( struct menu_btn_userdata ud ) return 1; return 0; } +#endif struct menu_button { @@ -218,6 +221,7 @@ VG_STATIC menu_buttons[] = { "res_info", menu_vis, {k_menu_page_settings}, }, +#if 0 { "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}}, @@ -228,6 +232,7 @@ VG_STATIC menu_buttons[] = { "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}}, +#endif { "text_paused", menu_vis, {k_menu_page_main} }, @@ -299,7 +304,8 @@ VG_STATIC void menu_btn_map( int event ) 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 ); + vg_list_size(game_menu.maps_list[0].name), + k_strncpy_always_add_null ); game_menu.map_count ++; if( game_menu.map_count == vg_list_size(game_menu.maps_list) ) @@ -314,6 +320,7 @@ VG_STATIC void menu_btn_map( int event ) VG_STATIC void menu_crap_ui(void) { +#if 0 if( cl_menu && (game_menu.page == k_menu_page_map) ){ ui_rect box; box[0] = vg.window_x/2 - 150; @@ -342,6 +349,7 @@ VG_STATIC void menu_crap_ui(void) } } } +#endif } VG_STATIC void steam_on_game_overlay( CallbackMsg_t *msg ) @@ -358,13 +366,7 @@ VG_STATIC void steam_on_game_overlay( CallbackMsg_t *msg ) VG_STATIC void menu_init(void) { - vg_create_unnamed_input( &input_menu_h, k_input_type_axis ); - vg_create_unnamed_input( &input_menu_v, k_input_type_axis ); - 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 ); - +#if 0 vg_apply_bind_str( &input_menu_h, "", "gp-ls-h" ); vg_apply_bind_str( &input_menu_h, "+", "right" ); vg_apply_bind_str( &input_menu_h, "-", "left" ); @@ -377,22 +379,21 @@ VG_STATIC void menu_init(void) 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" ); +#endif vg_linear_clear( vg_mem.scratch ); mdl_open( &menu_model, "models/rs_menu.mdl", vg_mem.rtmemory ); mdl_load_metadata_block( &menu_model, vg_mem.rtmemory ); - mdl_load_mesh_block( &menu_model, vg_mem.scratch ); mdl_load_array( &menu_model, &menu_markers, "ent_marker", vg_mem.rtmemory ); //mdl_invert_uv_coordinates( &menu_model ); + mdl_async_load_glmesh( &menu_model, &menu_glmesh ); mdl_close( &menu_model ); - vg_acquire_thread_sync(); - { - mdl_unpack_glmesh( &menu_model, &menu_glmesh ); - vg_tex2d_init( (vg_tex2d *[]){ &tex_menu }, 1 ); - } - vg_release_thread_sync(); + vg_tex2d_load_qoi_async_file( "textures/menu.qoi", + VG_TEX2D_CLAMP|VG_TEX2D_NEAREST, + &tex_menu ); + for( int i=0; imesh ){ vg_info( "info: %s\n", btn->name ); - vg_fatal_exit_loop( "Menu programming error" ); + vg_fatal_error( "Menu programming error" ); } } @@ -430,6 +431,7 @@ VG_STATIC void menu_init(void) VG_STATIC void menu_run_directional(void) { +#if 0 struct menu_button *btn = &menu_buttons[ game_menu.loc ]; if( vg_input_button_down( &input_menu_press ) ){ @@ -465,11 +467,15 @@ VG_STATIC void menu_run_directional(void) } } } +#endif } VG_STATIC int menu_page_should_backout(void) { + return 0; +#if 0 return vg_input_button_down( &input_menu_back ); +#endif } VG_STATIC void menu_close(void) @@ -499,6 +505,7 @@ VG_STATIC void menu_page_map(void) } if( game_menu.map_count > 0 ){ +#if 0 float v = input_menu_v.axis.value; if( (fabsf(v) > 0.7f) && (menu_input_cooldown <= 0.0f) ){ audio_lock(); @@ -534,6 +541,7 @@ VG_STATIC void menu_page_map(void) menu_close(); #endif } +#endif } menu_fov_target = 80.0f; @@ -553,6 +561,7 @@ VG_STATIC void menu_page_quit(void) void temp_update_playermodel(void); VG_STATIC void menu_page_skater(void) { +#if 0 float h = input_menu_h.axis.value; menu_fov_target = 97.0f; @@ -596,11 +605,13 @@ VG_STATIC void menu_page_skater(void) temp_update_playermodel(); } +#endif } VG_STATIC void menu_slider( float *value, int set_value, mdl_mesh *slider, v3f co_min, v3f co_max ) { +#if 0 if( set_value ){ float h = input_menu_h.axis.value; if( fabsf(h) > 0.04f ) @@ -609,6 +620,7 @@ VG_STATIC void menu_slider( float *value, int set_value, } v3_lerp( co_min, co_max, *value, slider->transform.co ); +#endif } VG_STATIC void menu_page_settings(void) @@ -642,13 +654,18 @@ VG_STATIC void menu_page_settings(void) VG_STATIC void menu_update(void) { +#if 0 vg_input_update( 1, &input_menu_h ); vg_input_update( 1, &input_menu_v ); 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 ); +#endif + return; + +#if 0 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; @@ -763,6 +780,7 @@ VG_STATIC void menu_update(void) if( cl_menu ){ menu_input_cooldown -= vg.time_frame_delta; } +#endif } /* https://iquilezles.org/articles/functions/ */ @@ -794,7 +812,9 @@ VG_STATIC void menu_render_fg( camera *cam ) shader_model_menu_use(); shader_model_menu_uColour( (v4f){ 1.0f,1.0f,1.0f,1.0f} ); shader_model_menu_uTexMain( 1 ); - vg_tex2d_bind( &tex_menu, 1 ); + + glActiveTexture( GL_TEXTURE1 ); + glBindTexture( GL_TEXTURE_2D, tex_menu ); shader_model_menu_uPv( cam->mtx.pv ); shader_model_menu_uPvmPrev( cam->mtx_prev.pv );