X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_render.c;h=0d7e9221f547e2b7042e1d3ee22e0cacc47cb139;hb=5bfb36032928ba9f8d12e72961af68bfab9ea648;hp=d0d14a4c5617ff8470415ceb91c266fd0e1ecf31;hpb=3e59ac7081ea3005060b56449bc77c8f73cdc6b6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_render.c b/player_render.c index d0d14a4..0d7e922 100644 --- a/player_render.c +++ b/player_render.c @@ -162,18 +162,20 @@ VG_STATIC void player_apply_pose_to_skeleton( player_instance *player ){ VG_STATIC void player__animate( player_instance *player ){ if( _player_animate[ player->subsystem ] && - _player_pose[ player->subsystem ] ){ + _player_pose[ player->subsystem ] ){ _player_animate[ player->subsystem ]( player ); _player_pose[ player->subsystem ]( player, &player->pose ); - player_pose *pose = &player->pose; struct skeleton *sk = &player->playeravatar->sk; if( player->holdout_time > 0.0f ){ + player_pose *pose = &player->pose; 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; }