X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gui.h;h=c1ce8d71a41ea81120b6c0767e56664c41a10441;hb=95f6ef1a859423a0d9554ac6a9f4c6cbd8bb540c;hp=a84835d99108b30e0004a4824462bb1f742ae115;hpb=ca1798f62b65b72703e960d132dd0170728b7709;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gui.h b/gui.h index a84835d..c1ce8d7 100644 --- a/gui.h +++ b/gui.h @@ -1,19 +1,32 @@ -#ifndef GUI_H -#define GUI_H - +#pragma once #include "font.h" #include "input.h" #include "player.h" +#include "vg/vg_imgui.h" + +#define GUI_COL_DARK ui_opacity( 0x00000000, 0.7f ) +#define GUI_COL_NORM ui_opacity( 0x00101010, 0.7f ) +#define GUI_COL_ACTIVE ui_opacity( 0x00444444, 0.7f ) +#define GUI_COL_CLICK ui_opacity( 0x00858585, 0.7f ) +#define GUI_COL_HI ui_opacity( 0x00ffffff, 0.8f ) enum gui_icon { k_gui_icon_tick = 0, + k_gui_icon_tick_2d, k_gui_icon_exclaim, + k_gui_icon_exclaim_2d, k_gui_icon_board, k_gui_icon_world, k_gui_icon_rift, k_gui_icon_rift_run, + k_gui_icon_rift_run_2d, k_gui_icon_friend, k_gui_icon_player, + k_gui_icon_rift_run_gold, + k_gui_icon_rift_run_silver, + k_gui_icon_glider, + k_gui_icon_spawn, + k_gui_icon_spawn_select, k_gui_icon_count, }; @@ -37,7 +50,7 @@ struct{ v4f colour; int colour_changed; } - icon_draw_buffer[32]; + icon_draw_buffer[64]; u32 icon_draw_count; v4f cur_icon_colour; int colour_changed; @@ -76,12 +89,9 @@ static struct gui_helper *gui_new_helper( vg_input_op *bind, vg_str *out_text ){ return helper; } -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; +static void gui_render_icons(void) +{ + vg_camera ortho; float fl = 0.0f, fr = vg.window_x, @@ -97,10 +107,9 @@ static void gui_draw(void){ ortho.mtx.p[3][1] = (ft + fb) * -tb; ortho.mtx.p[3][3] = 1.0f; m4x3_identity( ortho.transform ); - camera_update_view( &ortho ); + vg_camera_update_view( &ortho ); m4x4_mul( ortho.mtx.p, ortho.mtx.v, ortho.mtx.pv ); /* HACK */ - camera_finalize( &ortho ); - + vg_camera_finalize( &ortho ); /* icons */ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho ); @@ -128,91 +137,89 @@ static void gui_draw(void){ } gui.icon_draw_count = 0; +} +static void gui_draw(void) +{ + if( gui.active_positional_helper && + (v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f) ) + gui_helper_clear(); + /* helpers + * ----------------------------------------------------------------- */ gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f, vg.time_frame_delta*2.0f ); - if( gui.factive > 0.01f ){ - /* draw bottom bar */ - glEnable(GL_BLEND); - glDisable(GL_DEPTH_TEST); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glBlendEquation(GL_FUNC_ADD); - - shader_blitcolour_use(); - shader_blitcolour_uColour( (v4f){ 0.0f, 0.0f, 0.0f, gui.factive*0.8f } ); - render_fsquad1(); - } - - f64 loc_t = (vg.time_real - gui.location_time) / 5.0; - if( (loc_t < 1.0) && (gui.location_time != 0.0) ){ - /* yep this code is a mess, i dont care anymore */ - glEnable(GL_BLEND); - glDisable(GL_DEPTH_TEST); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glBlendEquation(GL_FUNC_ADD); + ui_font_face( &vgf_default_title ); + ui_px height = vg_ui.font->ch + 16; + ui_rect lwr = { 0, vg.window_y - height, vg.window_x, height }; - f32 t = 1.0f-vg_minf(1.0f,vg_minf(loc_t*20.0f,2.0f-loc_t*2.0f)), - o = 1.0f-t*t*(2.0f-t); + ui_px x = 0; + for( u32 i=0; ibinding, 1 ); - f32 dy = ft/0.79f, - scale = dy*0x1p-4f*0.5f; - - m3x3_identity( mmdl ); - m3x3_scale( mmdl, (v3f){scale,scale,scale} ); - v3_zero( mmdl[3] ); - - f32 pad = dy*0x1p-4f*0.125f; - f32 w = font3d_string_width( 2, gui.location ); - - mmdl[3][0] = fr*0.5f - w*scale*0.5f; - mmdl[3][1] = 0.3f*ft+pad*2.0f; + ui_rect box = { x, lwr[1], 1000, lwr[3] }; + + u32 fg = 0; + f32 opacity = 0.4f; + if( helper->greyed ) + { + fg = ui_colour(k_ui_fg+2); + opacity = 0.1f; + } - font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho ); - shader_model_font_uColour( (v4f){1.2f,1.2f,1.2f,o} ); - font3d_simple_draw( 2, gui.location, &ortho, mmdl ); + struct ui_vert *bg = ui_fill( box, ui_opacity( GUI_COL_DARK, opacity ) ); + + u32 w; + box[0] += 16; + w = ui_text( box, buf, 1, k_ui_align_middle_left, fg ); + w *= vg_ui.font->sx; + bg[1].co[0] = x + w + 32; + bg[2].co[0] = x + w + 32; + x += w + 32; + + box[0] = x; + bg = ui_fill( box, ui_opacity( GUI_COL_NORM, opacity*0.7f ) ); + box[0] += 8; + w = ui_text( box, helper->text, 1, k_ui_align_middle_left, fg ); + w *= vg_ui.font->sx; + bg[1].co[0] = box[0] + w + 16; + bg[2].co[0] = box[0] + w + 16; + x += w + 32; } - else - font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho ); - - float dy = ft/0.79f, - scale = dy*0x1p-4f*0.75f; - m3x3_identity( mmdl ); - m3x3_scale( mmdl, (v3f){scale,scale,scale} ); - v3_zero( mmdl[3] ); + vg_ui.frosting = gui.factive*0.015f; + ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); + vg_ui.frosting = 0.0f; - float pad = dy*0x1p-4f*0.125f; - mmdl[3][0] = pad*2.0f; - mmdl[3][1] = pad; - - for( u32 i=0; ibinding, 1 ); + f64 loc_t = (vg.time_real - gui.location_time) / 5.0; + if( (loc_t < 1.0) && (gui.location_time != 0.0) ) + { + f32 t = 1.0f-vg_minf(1.0f,vg_minf(loc_t*20.0f,2.0f-loc_t*2.0f)), + o = 1.0f-t*t*(2.0f-t); - font3d_setcolour( (v4f){1.0f,1.0f,1.0f, helper->greyed? 0.5f: 1.0f} ); - font3d_simple_draw( 2, buf, &ortho, mmdl ); + ui_rect box = { 0, (vg.window_y*2)/3 - height/2, vg.window_x, height }; + ui_fill( box, ui_opacity( GUI_COL_NORM, 0.5f ) ); + ui_text( box, gui.location, 1, k_ui_align_middle_center, 0 ); - const char *make_smaller = "\x02\xaf\x03 "; - font3d_draw( make_smaller ); - font3d_draw( helper->text ); - - float w = gui_font3d.offset[0]+1.0f; - mmdl[3][0] += w*scale; + vg_ui.colour[3] = o; + ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y ); } + + vg_ui.colour[3] = 1.0f; + ui_font_face( &vgf_default_small ); } -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; @@ -312,13 +319,23 @@ static void gui_init(void){ mdl_load_metadata_block( &gui.model_icons, alloc ); gui.icons[ k_gui_icon_tick ] = gui_find_icon( "icon_tick" ); + gui.icons[ k_gui_icon_tick_2d ] = gui_find_icon( "icon_tick2d" ); gui.icons[ k_gui_icon_exclaim ] = gui_find_icon( "icon_exclaim" ); + gui.icons[ k_gui_icon_exclaim_2d ] = gui_find_icon( "icon_exclaim2d" ); 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_rift_run_2d ] = gui_find_icon( "icon_rift_run2d" ); gui.icons[ k_gui_icon_friend ] = gui_find_icon( "icon_friend" ); gui.icons[ k_gui_icon_player ] = gui_find_icon( "icon_player" ); + gui.icons[ k_gui_icon_glider ] = gui_find_icon( "icon_glider" ); + gui.icons[ k_gui_icon_spawn ] = gui_find_icon( "icon_spawn" ); + gui.icons[ k_gui_icon_spawn_select ] = gui_find_icon( "icon_spawn_select" ); + gui.icons[ k_gui_icon_rift_run_gold ] = + gui_find_icon("icon_rift_run_medal_gold"); + gui.icons[ k_gui_icon_rift_run_silver]= + gui_find_icon("icon_rift_run_medal_silver"); vg_linear_clear( vg_mem.scratch ); if( !mdl_arrcount( &gui.model_icons.textures ) ) @@ -330,8 +347,6 @@ static void gui_init(void){ VG_TEX2D_LINEAR|VG_TEX2D_CLAMP, &gui.icons_texture ); - mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh ); + mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh, NULL ); mdl_close( &gui.model_icons ); } - -#endif /* GUI_H */