VG_STATIC const char *playermodels[] = { "ch_new", "ch_jordan", "ch_outlaw" };
-vg_tex2d tex_menu = { .path = "textures/menu.qoi",.flags = VG_TEXTURE_NEAREST };
+GLuint tex_menu;
VG_STATIC struct input_binding input_menu_h,
input_menu_v,
mdl_open( &menu_model, "models/rs_menu.mdl", vg_mem.rtmemory );
mdl_load_metadata_block( &menu_model, vg_mem.rtmemory );
- mdl_load_mesh_block( &menu_model, vg_mem.scratch );
mdl_load_array( &menu_model, &menu_markers, "ent_marker", vg_mem.rtmemory );
//mdl_invert_uv_coordinates( &menu_model );
+ mdl_async_load_glmesh( &menu_model, &menu_glmesh );
mdl_close( &menu_model );
- vg_acquire_thread_sync();
- {
- mdl_unpack_glmesh( &menu_model, &menu_glmesh );
- vg_tex2d_init( (vg_tex2d *[]){ &tex_menu }, 1 );
- }
- vg_release_thread_sync();
+ vg_tex2d_load_qoi_async_file( "textures/menu.qoi",
+ VG_TEX2D_CLAMP|VG_TEX2D_NEAREST,
+ &tex_menu );
+
for( int i=0; i<vg_list_size(menu_buttons); i++ ){
struct menu_button *btn = &menu_buttons[i];
if( !btn->mesh ){
vg_info( "info: %s\n", btn->name );
- vg_fatal_exit_loop( "Menu programming error" );
+ vg_fatal_error( "Menu programming error" );
}
}
if( set_value ){
float h = input_menu_h.axis.value;
if( fabsf(h) > 0.04f )
- *value += h * vg.frame_delta;
+ *value += h * vg.time_frame_delta;
*value = vg_clampf( *value, 0.0f, 1.0f );
}
m3x3_mul( player->basis, menu_mdl_mtx, menu_mdl_mtx );
menu_smooth_fov = vg_lerpf( menu_smooth_fov, menu_fov_target,
- vg.frame_delta * 8.2f );
+ vg.time_frame_delta * 8.2f );
}
/* Extra */
float y = atan2f( delta[0], delta[2] ),
p = -sinf(delta[1]),
- dt = vg.frame_delta;
+ dt = vg.time_frame_delta;
menu_extra_angles[0] = vg_lerpf( menu_extra_angles[0], y, dt );
menu_extra_angles[1] = vg_lerpf( menu_extra_angles[1], p, dt );
menu_camera_angles[0] = fmodf( menu_camera_angles[0], VG_TAUf );
}
- float dt = vg.frame_delta * 6.0f;
+ float dt = vg.time_frame_delta * 6.0f;
menu_opacity = vg_lerpf( menu_opacity, cl_menu&&!cl_menu_go_away, dt );
if( menu_opacity <= 0.01f ){
vg.time_rate = 1.0-(double)menu_opacity;
if( cl_menu ){
- menu_input_cooldown -= vg.frame_delta;
+ menu_input_cooldown -= vg.time_frame_delta;
}
}
shader_model_menu_use();
shader_model_menu_uColour( (v4f){ 1.0f,1.0f,1.0f,1.0f} );
shader_model_menu_uTexMain( 1 );
- vg_tex2d_bind( &tex_menu, 1 );
+
+ glActiveTexture( GL_TEXTURE1 );
+ glBindTexture( GL_TEXTURE_2D, tex_menu );
shader_model_menu_uPv( cam->mtx.pv );
shader_model_menu_uPvmPrev( cam->mtx_prev.pv );
tsize1 = i==game_menu.loc? 0.07f: 0.0f,
tsize = tsize0+tsize1;
- btn->falpha = vg_lerpf( btn->falpha, talpha, vg.frame_delta * 14.0f );
- btn->fsize = vg_lerpf( btn->fsize, tsize, vg.frame_delta * 7.0f );
+ btn->falpha = vg_lerpf( btn->falpha, talpha, vg.time_frame_delta * 14.0f);
+ btn->fsize = vg_lerpf( btn->fsize, tsize, vg.time_frame_delta * 7.0f );
/* Colour */
v4f vselected = {0.95f*1.3f,0.45f*1.3f,0.095f*1.3f, 1.0f},