X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gui.h;h=7c2dbb6e5f34e5ee0c795338a18650744881c9a8;hb=6b036c10d38e7d691eb0bc06c29235b450c3ff10;hp=8013cb014da3e099f0e8d674a9ea5a2505cba09c;hpb=f2c3e6ffba0231be14961f0149106cecbade8124;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gui.h b/gui.h index 8013cb0..7c2dbb6 100644 --- a/gui.h +++ b/gui.h @@ -5,6 +5,18 @@ #include "input.h" #include "player.h" +enum gui_icon { + k_gui_icon_tick = 0, + k_gui_icon_exclaim, + 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, +}; + struct{ struct gui_helper{ const char *bindstr, *text; @@ -12,6 +24,17 @@ struct{ helpers[4]; u32 helper_count; + 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; @@ -28,10 +51,16 @@ struct{ k_guitrick_type_isc } trick_type; + + mdl_context model_icons; + GLuint icons_texture; + glmesh icons_mesh; + + 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}; -VG_STATIC +static void gui_helper_action( const char *bindstr, const char *text ){ if( gui.helper_count >= vg_list_size(gui.helpers) ){ vg_error( "Too many helpers\n" ); @@ -43,9 +72,7 @@ void gui_helper_action( const char *bindstr, const char *text ){ helper->text = text; } -VG_STATIC -void gui_draw(void) -{ +static void gui_draw(void){ if( v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f ){ gui.trick_type = k_guitrick_type_none; } @@ -89,6 +116,36 @@ void gui_draw(void) m4x4_mul( ortho.mtx.p, ortho.mtx.v, ortho.mtx.pv ); /* HACK */ camera_finalize( &ortho ); + + /* icons */ + font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho ); + mesh_bind( &gui.icons_mesh ); + + m4x3f mmdl; + m4x3_identity( mmdl ); + shader_model_font_uMdl( mmdl ); + + 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 ]; + if( sm ) + mdl_draw_submesh( sm ); + } + + gui.icon_draw_count = 0; + + + gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f, vg.time_frame_delta*2.0f ); @@ -122,29 +179,26 @@ void gui_draw(void) f32 dy = ft/0.79f, scale = dy*0x1p-4f*0.5f; - m4x3f mmdl; 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( &gui.font,2,gui.location ); + 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; - font3d_bind( &gui.font, &ortho ); + 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( &gui.font, 2, k_font_shader_default, - gui.location, &ortho, mmdl ); + font3d_simple_draw( 2, gui.location, &ortho, mmdl ); } - - font3d_bind( &gui.font, &ortho ); + else + font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &ortho ); float dy = ft/0.79f, scale = dy*0x1p-4f*0.75f; - m4x3f mmdl; m3x3_identity( mmdl ); m3x3_scale( mmdl, (v3f){scale,scale,scale} ); v3_zero( mmdl[3] ); @@ -156,32 +210,21 @@ void gui_draw(void) for( u32 i=0; ibindstr, &ortho, mmdl, &render ); - font3d_draw( &render ); + font3d_setcolour( (v4f){1.0f,1.0f,1.0f,1.0f} ); + font3d_simple_draw( 2, helper->bindstr, &ortho, mmdl ); const char *make_smaller = "\x02\xaf\x03 "; - render.u8pch = (const u8*)make_smaller; - font3d_draw( &render ); - - render.u8pch = (u8*)helper->text; - font3d_draw( &render ); + font3d_draw( make_smaller ); + font3d_draw( helper->text ); - float w = render.offset[0]+1.0f; + float w = gui_font3d.offset[0]+1.0f; mmdl[3][0] += w*scale; } gui.helper_count = 0; } -VG_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; @@ -197,7 +240,7 @@ int gui_location_print_ccmd( int argc, const char *argv[] ){ return 0; } -VG_STATIC int gui_showtrick_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; @@ -213,11 +256,69 @@ VG_STATIC int gui_showtrick_ccmd( int argc, const char *argv[] ){ return 1; } -VG_STATIC void gui_init(void) -{ +static void gui_draw_icon( enum gui_icon icon, v2f co, f32 size ){ + if( gui.icon_draw_count == vg_list_size(gui.icon_draw_buffer) ) + return; + + struct icon_call *call = &gui.icon_draw_buffer[ gui.icon_draw_count ++ ]; + + call->icon = icon; + call->location[0] = co[0] * (f32)vg.window_x; + 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 ){ + mdl_mesh *mesh = mdl_find_mesh( &gui.model_icons, name ); + if( mesh ){ + if( mesh->submesh_count ){ + return mdl_arritm( &gui.model_icons.submeshs, mesh->submesh_start ); + } + } + + return NULL; +} + +static void gui_init(void){ font3d_load( &gui.font, "models/rs_font.mdl", vg_mem.rtmemory ); vg_console_reg_cmd( "gui_location", gui_location_print_ccmd, NULL ); vg_console_reg_cmd( "showtrick", gui_showtrick_ccmd, NULL ); + + /* load icons */ + void *alloc = vg_mem.rtmemory; + mdl_open( &gui.model_icons, "models/rs_icons.mdl", alloc ); + mdl_load_metadata_block( &gui.model_icons, alloc ); + + gui.icons[ k_gui_icon_tick ] = gui_find_icon( "icon_tick" ); + gui.icons[ k_gui_icon_exclaim ] = gui_find_icon( "icon_exclaim" ); + 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 ) ) + vg_fatal_error( "No texture in menu file" ); + mdl_texture *tex0 = mdl_arritm( &gui.model_icons.textures, 0 ); + void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size ); + mdl_fread_pack_file( &gui.model_icons, &tex0->file, data ); + vg_tex2d_load_qoi_async( data, tex0->file.pack_size, + VG_TEX2D_LINEAR|VG_TEX2D_CLAMP, + &gui.icons_texture ); + + mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh ); + mdl_close( &gui.model_icons ); } #endif /* GUI_H */