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<<menu.page)) ) continue;
if( (item->type != k_ent_menuitem_type_page) &&
(item->type != k_ent_menuitem_type_visual) &&
+ (item->type != k_ent_menuitem_type_visual_nocol) &&
(item->groups & (0x1<<menu.page)) ){
menu.loc = item;
}
menu_setitem_type( menu.ctr_steam, k_ent_menuitem_type_disabled );
if( vg_input.display_input_method == k_input_method_kbm )
- menu_setitem_type( menu.ctr_kbm, k_ent_menuitem_type_visual );
+ menu_setitem_type( menu.ctr_kbm, k_ent_menuitem_type_visual_nocol );
else{
if( vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS3 ||
vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS4 ||
vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS5 ){
- menu_setitem_type( menu.ctr_ps, k_ent_menuitem_type_visual );
+ menu_setitem_type( menu.ctr_ps, k_ent_menuitem_type_visual_nocol );
}
else {
- menu_setitem_type( menu.ctr_xbox, k_ent_menuitem_type_visual );
+ menu_setitem_type( menu.ctr_xbox, k_ent_menuitem_type_visual_nocol );
}
/* FIXME: Steam/Deck controller detection? */
}
}
}
- if( item->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{
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; i<text_count; i++ ){
ent_menuitem *item = text_list[ i ];
m4x3f transform;
u32 variant = item->binding.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 );
}
}