From 63279f9bf898909f9c51f55bae224db7f1391858 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 25 Jul 2023 01:47:22 +0100 Subject: [PATCH] lerp root_q in holdout --- player_render.c | 2 ++ player_walk.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/player_render.c b/player_render.c index 38e6586..0d7e922 100644 --- a/player_render.c +++ b/player_render.c @@ -174,6 +174,8 @@ VG_STATIC void player__animate( player_instance *player ){ skeleton_lerp_pose( sk, pose->keyframes, player->holdout_pose.keyframes, player->holdout_time, pose->keyframes ); + q_nlerp( pose->root_q, player->holdout_pose.root_q, + player->holdout_time, pose->root_q ); player->holdout_time -= vg.time_frame_delta * 2.0f; } diff --git a/player_walk.c b/player_walk.c index 815e4b4..87c2246 100644 --- a/player_walk.c +++ b/player_walk.c @@ -918,6 +918,12 @@ VG_STATIC void player__walk_bind( player_instance *player ){ VG_STATIC void player__walk_transition( player_instance *player ){ struct player_walk *w = &player->_walk; w->state.activity = k_walk_activity_air; + w->state.outro_type = k_walk_outro_none; + w->state.outro_start_time = 0.0; + w->state.jump_queued = 0; + w->state.jump_input_time = 0.0; + w->state.walk_timer = 0.0f; + w->state.step_phase = 0; v3f fwd = { 0.0f, 0.0f, 1.0f }; q_mulv( player->rb.q, fwd, fwd ); -- 2.25.1