X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_render.c;h=aed6caf099359f9993c050344ebb1ef17c77a7c3;hb=6e6c7f31b8f17af3814727109e48fc6f85ef04b1;hp=4793637bbda83e96f745fa8e0a7d9bd5981b8c38;hpb=4e9c3ed7d90219258c6b7d88cf389188dbbdfd70;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_render.c b/player_render.c
index 4793637..aed6caf 100644
--- 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_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 );
@@ -225,20 +229,15 @@ static void player__animate(void){
       localplayer.holdout_time -= vg.time_frame_delta * 2.0f;
    }
 
-   static float blinkt = 1.0f,
-                blinkl = 0.0f;
-
-   if( blinkt < 0.0f ){
-      blinkt = (1.0f-powf(vg_randf64(),4.0f))*4.0f;
-      blinkl = 0.08f;
+   effect_blink_apply( &localplayer.effect_data.blink,
+                       &localplayer.pose, vg.time_delta );
+   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 );
    }
 
-   pose->keyframes[ localplayer.id_eyes-1 ].s[1] = blinkl > 0.0f? 0.2f: 1.0f;
-
-   blinkt -= vg.time_delta;
-   blinkl -= vg.time_delta;
-
-   apply_full_skeleton_pose( sk, &localplayer.pose, localplayer.final_mtx );
    skeleton_debug( sk, localplayer.final_mtx );
 
    if( sys->post_animate )