X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gui.h;h=30664d8a00bb7b8905e92dc0fd10a04bf0af33cf;hb=2c91a71533b4ce86b9e7fd708420ae05c74d8f52;hp=5cfe468501b8bcb27fb9359f72d03beaca56d959;hpb=b405845ac2cc8eb8e227eb5785f48f5dde9b0f26;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gui.h b/gui.h index 5cfe468..30664d8 100644 --- a/gui.h +++ b/gui.h @@ -11,23 +11,35 @@ enum gui_icon { k_gui_icon_board, k_gui_icon_world, k_gui_icon_rift, + k_gui_icon_rift_run, + k_gui_icon_friend, k_gui_icon_count, }; +#define GUI_HELPER_TEXT_LENGTH 32 + struct{ struct gui_helper{ - const char *bindstr, *text; + vg_input_op *binding; + char text[GUI_HELPER_TEXT_LENGTH]; + int greyed; } helpers[4]; u32 helper_count; + int active_positional_helper; + struct icon_call { enum gui_icon icon; v4f location; + v4f colour; + int colour_changed; } icon_draw_buffer[32]; u32 icon_draw_count; + v4f cur_icon_colour; + int colour_changed; char location[64]; f64 location_time; @@ -36,15 +48,6 @@ struct{ font3d font; v3f trick_co; - enum guitrick_type{ - k_guitrick_type_none, - k_guitrick_type_ollie, - k_guitrick_type_trick, - k_guitrick_type_backflip, - k_guitrick_type_pump, - k_guitrick_type_isc - } - trick_type; mdl_context model_icons; GLuint icons_texture; @@ -52,45 +55,30 @@ struct{ mdl_submesh *icons[ k_gui_icon_count ]; } -static gui; +static gui = {.cur_icon_colour = {1.0f,1.0f,1.0f,1.0f},.colour_changed=1}; + +static void gui_helper_clear(void){ + gui.helper_count = 0; + gui.active_positional_helper = 0; +} -static -void gui_helper_action( const char *bindstr, const char *text ){ +static struct gui_helper *gui_new_helper( vg_input_op *bind, vg_str *out_text ){ if( gui.helper_count >= vg_list_size(gui.helpers) ){ vg_error( "Too many helpers\n" ); - return; + return NULL; } struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ]; - helper->bindstr = bindstr; - helper->text = text; + helper->greyed = 0; + helper->binding = bind; + vg_strnull( out_text, helper->text, sizeof(helper->text) ); + return helper; } -static -void gui_draw(void) -{ - if( v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f ){ - gui.trick_type = k_guitrick_type_none; - } - - if( gui.trick_type == k_guitrick_type_pump ){ - gui_helper_action(axis_display_string(k_sraxis_grab),"Crouch"); - } - else if( gui.trick_type == k_guitrick_type_backflip ){ - gui_helper_action(joystick_display_string(k_srjoystick_steer,1),"Flip"); - } - else if( gui.trick_type == k_guitrick_type_ollie ){ - gui_helper_action(button_display_string(k_srbind_jump),"Ollie"); - } - else if( gui.trick_type == k_guitrick_type_trick ){ - gui_helper_action(button_display_string(k_srbind_trick0),"Shuvit"); - gui_helper_action(button_display_string(k_srbind_trick1),"Kickflip"); - gui_helper_action(button_display_string(k_srbind_trick2),"Tre-Flip"); - } - else if( gui.trick_type == k_guitrick_type_isc ){ - gui_helper_action(button_display_string(k_srbind_camera),"Camera"); - gui_helper_action(button_display_string(k_srbind_use), "Skate/Walk"); - } +static void gui_draw(void){ + if( gui.active_positional_helper && + (v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f) ) + gui_helper_clear(); camera ortho; @@ -121,13 +109,16 @@ void gui_draw(void) m4x3_identity( mmdl ); shader_model_font_uMdl( mmdl ); - shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} ); glActiveTexture( GL_TEXTURE0 ); glBindTexture( GL_TEXTURE_2D, gui.icons_texture ); shader_model_font_uTexMain( 0 ); for( u32 i=0; icolour_changed ) + shader_model_font_uColour( call->colour ); + shader_model_font_uOffset( call->location ); mdl_submesh *sm = gui.icons[ call->icon ]; @@ -203,8 +194,13 @@ void gui_draw(void) for( u32 i=0; ibindstr, &ortho, mmdl ); + char buf[32]; + vg_str str; + vg_strnull( &str, buf, sizeof(buf) ); + vg_input_string( &str, helper->binding, 1 ); + + font3d_setcolour( (v4f){1.0f,1.0f,1.0f, helper->greyed? 0.5f: 1.0f} ); + font3d_simple_draw( 2, buf, &ortho, mmdl ); const char *make_smaller = "\x02\xaf\x03 "; font3d_draw( make_smaller ); @@ -213,12 +209,9 @@ void gui_draw(void) float w = gui_font3d.offset[0]+1.0f; mmdl[3][0] += w*scale; } - - gui.helper_count = 0; } -static -int gui_location_print_ccmd( int argc, const char *argv[] ){ +static int gui_location_print_ccmd( int argc, const char *argv[] ){ if( argc > 0 ){ char new_loc[64]; vg_str str; @@ -236,15 +229,39 @@ int gui_location_print_ccmd( int argc, const char *argv[] ){ static int gui_showtrick_ccmd( int argc, const char *argv[] ){ if( argc == 1 ){ - enum guitrick_type type = k_guitrick_type_none; - if( !strcmp( argv[0], "pump" ) ) type = k_guitrick_type_pump; - else if( !strcmp( argv[0], "flip" ) ) type = k_guitrick_type_backflip; - else if( !strcmp( argv[0], "ollie" ) ) type = k_guitrick_type_ollie; - else if( !strcmp( argv[0], "trick" ) ) type = k_guitrick_type_trick; - else if( !strcmp( argv[0], "misc" ) ) type = k_guitrick_type_isc; + gui_helper_clear(); + vg_str text; + + if( !strcmp( argv[0], "pump" ) ){ + if( gui_new_helper( input_axis_list[k_sraxis_grab], &text ) ) + vg_strcat( &text, "Pump" ); + } + else if( !strcmp( argv[0], "flip" ) ){ + if( gui_new_helper( input_joy_list[k_srjoystick_steer], &text ) ) + vg_strcat( &text, "Flip" ); + } + else if( !strcmp( argv[0], "ollie" ) ){ + if( gui_new_helper( input_button_list[k_srbind_jump], &text ) ) + vg_strcat( &text, "Ollie" ); + } + else if( !strcmp( argv[0], "trick" ) ){ + if( gui_new_helper( input_button_list[k_srbind_trick0], &text ) ) + vg_strcat( &text, "Shuvit" ); + if( gui_new_helper( input_button_list[k_srbind_trick1], &text ) ) + vg_strcat( &text, "Kickflip" ); + if( gui_new_helper( input_button_list[k_srbind_trick2], &text ) ) + vg_strcat( &text, "Tre-Flip" ); + } + else if( !strcmp( argv[0], "misc" ) ){ + if( gui_new_helper( input_button_list[k_srbind_camera], &text ) ) + vg_strcat( &text, "Camera" ); + if( gui_new_helper( input_button_list[k_srbind_use], &text ) ) + vg_strcat( &text, "Skate/Walk" ); + } else return 1; - gui.trick_type = type; + v3_copy( localplayer.rb.co, gui.trick_co ); + gui.active_positional_helper = 1; return 0; } return 1; @@ -261,6 +278,15 @@ static void gui_draw_icon( enum gui_icon icon, v2f co, f32 size ){ call->location[1] = co[1] * (f32)vg.window_y; call->location[2] = 0.0f; call->location[3] = size * (f32)vg.window_x; + + v4_copy( gui.cur_icon_colour, call->colour ); + call->colour_changed = gui.colour_changed; + gui.colour_changed = 0; +} + +static void gui_icon_setcolour( v4f colour ){ + gui.colour_changed = 1; + v4_copy( colour, gui.cur_icon_colour ); } static mdl_submesh *gui_find_icon( const char *name ){ @@ -289,6 +315,8 @@ static void gui_init(void){ gui.icons[ k_gui_icon_board ] = gui_find_icon( "icon_board" ); gui.icons[ k_gui_icon_world ] = gui_find_icon( "icon_world" ); gui.icons[ k_gui_icon_rift ] = gui_find_icon( "icon_rift" ); + gui.icons[ k_gui_icon_rift_run ] = gui_find_icon( "icon_rift_run" ); + gui.icons[ k_gui_icon_friend ] = gui_find_icon( "icon_friend" ); vg_linear_clear( vg_mem.scratch ); if( !mdl_arrcount( &gui.model_icons.textures ) )