struct{
struct gui_helper{
- struct input_binding *bind;
- const char *text;
+ const char *bindstr, *text;
}
helpers[4];
u32 helper_count;
+
+ float factive;
}
static gui;
camera_update_view( &ortho );
camera_finalize( &ortho );
- if( gui.helper_count ){
+ gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
+ vg.time_delta*2.0f );
+
+ if( gui.factive > 0.01f ){
/* draw bottom bar */
glEnable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
glBlendEquation(GL_FUNC_ADD);
shader_blitcolour_use();
- shader_blitcolour_uColour( (v4f){ 0.0f, 0.0f, 0.0f, 0.8f } );
+ shader_blitcolour_uColour( (v4f){ 0.0f, 0.0f, 0.0f, gui.factive*0.8f } );
render_fsquad1();
}
- glDisable(GL_BLEND);
font3d *font = &world_global.font;
font3d_bind( font, &ortho );
v3_zero( mmdl[3] );
float pad = dy*0x1p-4f*0.125f;
- mmdl[3][0] = pad;
+ mmdl[3][0] = pad*2.0f;
mmdl[3][1] = pad;
for( u32 i=0; i<gui.helper_count; i++ ){
shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
- float w = font3d_simple_draw( font, 1, helper->text, &ortho, mmdl )+0.2f;
+ struct font3d_render render;
+ font3d_begin( font, 2, &ortho, mmdl, &render );
+
+ render.u8pch = (u8*)helper->bindstr;
+ font3d_draw( &render );
+
+ const char *make_smaller = "\x02\xaf\x03 ";
+ render.u8pch = (const u8*)make_smaller;
+ font3d_draw( &render );
+
+ render.u8pch = (u8*)helper->text;
+ font3d_draw( &render );
+
+ float w = render.offset[0]+1.0f;
mmdl[3][0] += w*scale;
}
}
VG_STATIC
-void gui_helper_action( struct input_binding *bind, const char *text )
+void gui_helper_action( const char *bindstr, const char *text )
{
if( gui.helper_count >= vg_list_size(gui.helpers) )
vg_fatal_error( "Too many helpers\n" );
struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ];
- helper->bind = bind;
+ helper->bindstr = bindstr;
helper->text = text;
}