X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=inline;f=menu.h;h=86f573620f5fa10ecabe789d0a8d09b5590bc3c3;hb=f2e2b3c37719f839bc130625ee0fcf4ef3179750;hp=243bebfd70fb742ce7084aca2be32733a4892880;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git
diff --git a/menu.h b/menu.h
index 243bebf..86f5736 100644
--- a/menu.h
+++ b/menu.h
@@ -430,7 +430,8 @@ static void menu_update(void){
ent_menuitem *item = mdl_arritm( &menu.items, i );
if( item->type == k_ent_menuitem_type_page ) continue;
- if( item->type == k_ent_menuitem_type_visual ) continue;
+ if( (item->type == k_ent_menuitem_type_visual) ||
+ (item->type == k_ent_menuitem_type_visual_nocol) ) continue;
if( item->type == k_ent_menuitem_type_binding ) continue;
if( !(item->groups & (0x1<
type != k_ent_menuitem_type_page) &&
(item->type != k_ent_menuitem_type_visual) &&
+ (item->type != k_ent_menuitem_type_visual_nocol) &&
(item->groups & (0x1<type == k_ent_menuitem_type_visual ){
+ if( item->type == k_ent_menuitem_type_visual_nocol ){
shader_model_menu_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
}
else{
@@ -761,7 +763,7 @@ static void menu_render(void){
m4x3f local;
m4x3_identity( local );
- font3d_bind( &gui.font, &menu.view );
+ font3d_bind( &gui.font, k_font_shader_default, 0, NULL, &menu.view );
for( u32 i=0; ibinding.font_variant;
menu_binding_string( buf, item->binding.pstr_bind );
- f32 offset = font3d_string_width( &gui.font, variant, buf );
+ f32 offset = font3d_string_width( variant, buf );
local[3][0] = -0.5f * offset;
m4x3_mul( transform, local, transform );
- font3d_simple_draw( &gui.font, variant, k_font_shader_default, buf,
- &menu.view, transform );
+ font3d_simple_draw( variant, buf, &menu.view, transform );
}
}