X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_dead.c;h=e06c20abad85670825a3af264246352852abdd9c;hb=cca3ca3a92572c77f34a99ffa2f3d9a69d029000;hp=f040adb47c55309f74b83615e2e100b78acccbc6;hpb=c4c762ce6f3bbdcb770bbc42e349aebbc3390d9d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_dead.c b/player_dead.c index f040adb..e06c20a 100644 --- a/player_dead.c +++ b/player_dead.c @@ -14,8 +14,7 @@ VG_STATIC void player__dead_animate ( player_instance *player, v3_zero( anim->root_co ); q_identity( anim->root_q ); - for( int i=0; ipose ); i ++ ) - { + for( int i=0; ipose ); i ++ ){ v3_zero( anim->pose[i].co ); v3_fill( anim->pose[i].s, 1.0f ); q_identity( anim->pose[i].q ); @@ -32,9 +31,9 @@ VG_STATIC void player__dead_post_animate( player_instance *player ) struct ragdoll_part *part = &player->ragdoll.parts[ av->id_hip-1 ]; - v3_lerp( d->co_lpf, part->rb.co, vg.frame_delta*4.0f, d->co_lpf ); - v3_lerp( d->v_lpf, part->rb.v, vg.frame_delta*4.0f, d->v_lpf ); - v3_lerp( d->w_lpf, part->rb.w, vg.frame_delta*4.0f, d->w_lpf ); + v3_lerp( d->co_lpf, part->obj.rb.co, vg.frame_delta*4.0f, d->co_lpf ); + v3_lerp( d->v_lpf, part->obj.rb.v, vg.frame_delta*4.0f, d->v_lpf ); + v3_lerp( d->w_lpf, part->obj.rb.w, vg.frame_delta*4.0f, d->w_lpf ); v3_copy( d->co_lpf, player->rb.co ); v3_copy( d->v_lpf, player->rb.v ); @@ -55,9 +54,9 @@ VG_STATIC void player__dead_transition ( player_instance *player ) struct player_avatar *av = player->playeravatar; struct ragdoll_part *part = &player->ragdoll.parts[ av->id_hip-1 ]; struct player_dead *d = &player->_dead; - v3_copy( part->rb.co, d->co_lpf ); - v3_copy( part->rb.v, d->v_lpf ); - v3_copy( part->rb.w, d->w_lpf ); + v3_copy( part->obj.rb.co, d->co_lpf ); + v3_copy( part->obj.rb.v, d->v_lpf ); + v3_copy( part->obj.rb.w, d->w_lpf ); } #endif /* PLAYER_DEAD_C */