From eead7b53ab6afe9b9e9bda2d5bfa6891e8845453 Mon Sep 17 00:00:00 2001 From: hgn Date: Sun, 13 Aug 2023 11:13:53 +0100 Subject: [PATCH] cam height --- models_src/rs_menu.mdl | Bin 206168 -> 214848 bytes player_common.c | 4 +++- render.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/models_src/rs_menu.mdl b/models_src/rs_menu.mdl index d6e928b2c0b8b593a1671a7c32a83ed7749afda6..dc18773f4eab3fbb81f1fca917295900eab483d1 100644 GIT binary patch delta 7839 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 diff --git a/player_common.c b/player_common.c index 87d9056..e0a7776 100644 --- a/player_common.c +++ b/player_common.c @@ -73,7 +73,9 @@ VG_STATIC void player__cam_iterate( player_instance *player ){ else{ v3_copy( (v3f){-0.15f,1.75f,0.0f}, cc->fpv_viewpoint ); v3_copy( (v3f){0.0f,0.0f,0.0f}, cc->fpv_offset ); - v3_copy( (v3f){0.0f,1.4f,0.0f}, cc->tpv_offset ); + + f32 h = vg_lerpf( 0.4f, 1.4f, k_cam_height ); + v3_copy( (v3f){0.0f,h,0.0f}, cc->tpv_offset ); v3_add( cc->tpv_offset_extra, cc->tpv_offset, cc->tpv_offset ); } diff --git a/render.h b/render.h index 751ca1b..e77a809 100644 --- a/render.h +++ b/render.h @@ -20,6 +20,7 @@ static f32 k_render_scale = 1.0f; static i32 k_blur_effect = 1; static f32 k_blur_strength = 0.3f; static f32 k_fov = 0.86f; +static f32 k_cam_height = 0.8f; typedef struct framebuffer framebuffer; @@ -587,6 +588,8 @@ VG_STATIC void render_init(void) vg_console_reg_var( "render_scale", &k_render_scale, k_var_dtype_f32, VG_VAR_PERSISTENT ); vg_console_reg_var( "fov", &k_fov, k_var_dtype_f32, VG_VAR_PERSISTENT ); + vg_console_reg_var( "cam_height", &k_cam_height, + k_var_dtype_f32, VG_VAR_PERSISTENT ); vg_console_reg_var( "blur_effect", &k_blur_effect, k_var_dtype_i32, VG_VAR_PERSISTENT ); -- 2.25.1