projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
animator bugs
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_render.c
diff --git
a/player_render.c
b/player_render.c
index d0d14a4c5617ff8470415ceb91c266fd0e1ecf31..38e65867faa16bb6a4c7ee6bdfa749389ae316a6 100644
(file)
--- a/
player_render.c
+++ b/
player_render.c
@@
-162,15
+162,15
@@
VG_STATIC void player_apply_pose_to_skeleton( player_instance *player ){
VG_STATIC void player__animate( player_instance *player ){
if( _player_animate[ player->subsystem ] &&
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_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 ){
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 );
skeleton_lerp_pose( sk,
pose->keyframes, player->holdout_pose.keyframes,
player->holdout_time, pose->keyframes );