projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
force compression
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_render.c
diff --git
a/player_render.c
b/player_render.c
index ad56c241ec10f11dff072567cb1537a564b3a72b..aed6caf099359f9993c050344ebb1ef17c77a7c3 100644
(file)
--- a/
player_render.c
+++ b/
player_render.c
@@
-201,6
+201,10
@@
static void player__animate(void){
struct player_subsystem_interface *sys =
player_subsystems[localplayer.subsystem];
struct player_subsystem_interface *sys =
player_subsystems[localplayer.subsystem];
+ struct player_board *board =
+ addon_cache_item_if_loaded( k_addon_type_board,
+ localplayer.board_view_slot );
+
assert( sys->animate );
assert( sys->pose );
assert( sys->animator_data );
assert( sys->animate );
assert( sys->pose );
assert( sys->animator_data );
@@
-225,9
+229,15
@@
static void player__animate(void){
localplayer.holdout_time -= vg.time_frame_delta * 2.0f;
}
localplayer.holdout_time -= vg.time_frame_delta * 2.0f;
}
- v3_fill( pose->keyframes[ localplayer.id_eyes-1 ].co, sinf(vg.time) );
-
+ effect_blink_apply( &localplayer.effect_data.blink,
+ &localplayer.pose, vg.time_delta );
apply_full_skeleton_pose( sk, &localplayer.pose, localplayer.final_mtx );
apply_full_skeleton_pose( sk, &localplayer.pose, localplayer.final_mtx );
+
+ if( sys->effects ){
+ sys->effects( sys->animator_data, localplayer.final_mtx, board,
+ &localplayer.effect_data );
+ }
+
skeleton_debug( sk, localplayer.final_mtx );
if( sys->post_animate )
skeleton_debug( sk, localplayer.final_mtx );
if( sys->post_animate )