X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.h;h=1e2b8e7d422f607d432eb0873868c4710f39c722;hb=8c376ed2e4021a18b0a6c6e800109d67ad09d198;hp=b69345659642f2bdf9c589fd1e37d7e64c8c5f77;hpb=be8ea6efdbfd9c0fdad97401ed7d92041d8c8778;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/menu.h b/menu.h index b693456..1e2b8e7 100644 --- a/menu.h +++ b/menu.h @@ -604,7 +604,7 @@ VG_STATIC void menu_slider( float *value, int set_value, 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 ); } @@ -729,7 +729,7 @@ VG_STATIC void menu_update(void) 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 */ @@ -740,7 +740,7 @@ VG_STATIC void menu_update(void) 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 ); @@ -750,7 +750,7 @@ VG_STATIC void menu_update(void) 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 ){ @@ -761,7 +761,7 @@ VG_STATIC void menu_update(void) vg.time_rate = 1.0-(double)menu_opacity; if( cl_menu ){ - menu_input_cooldown -= vg.frame_delta; + menu_input_cooldown -= vg.time_frame_delta; } } @@ -807,8 +807,8 @@ VG_STATIC void menu_render_fg( camera *cam ) 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},