projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input update 1
[carveJwlIkooP6JGAAIwe30JlM.git]
/
gui.h
diff --git
a/gui.h
b/gui.h
index 1e576e62c87d0ec2185f8da340a533c4e23d4b0d..8cb94f1200fc0615b07f02ae72163aeff6644b09 100644
(file)
--- a/
gui.h
+++ b/
gui.h
@@
-10,6
+10,8
@@
struct{
}
helpers[4];
u32 helper_count;
}
helpers[4];
u32 helper_count;
+
+ float factive;
}
static gui;
}
static gui;
@@
-35,7
+37,10
@@
void gui_draw(void)
camera_update_view( &ortho );
camera_finalize( &ortho );
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);
/* draw bottom bar */
glEnable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
@@
-43,10
+48,9
@@
void gui_draw(void)
glBlendEquation(GL_FUNC_ADD);
shader_blitcolour_use();
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();
}
render_fsquad1();
}
- glDisable(GL_BLEND);
font3d *font = &world_global.font;
font3d_bind( font, &ortho );
font3d *font = &world_global.font;
font3d_bind( font, &ortho );
@@
-61,7
+65,7
@@
void gui_draw(void)
v3_zero( mmdl[3] );
float pad = dy*0x1p-4f*0.125f;
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++ ){
mmdl[3][1] = pad;
for( u32 i=0; i<gui.helper_count; i++ ){
@@
-69,7
+73,7
@@
void gui_draw(void)
shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
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.2
f;
+ float w = font3d_simple_draw( font,
2, helper->text, &ortho, mmdl )+1.0
f;
mmdl[3][0] += w*scale;
}
mmdl[3][0] += w*scale;
}
@@
-77,7
+81,7
@@
void gui_draw(void)
}
VG_STATIC
}
VG_STATIC
-void gui_helper_action(
struct input_binding
*bind, const char *text )
+void gui_helper_action(
void
*bind, const char *text )
{
if( gui.helper_count >= vg_list_size(gui.helpers) )
vg_fatal_error( "Too many helpers\n" );
{
if( gui.helper_count >= vg_list_size(gui.helpers) )
vg_fatal_error( "Too many helpers\n" );