diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs index 8a1e05976c..c1402ac40c 100644 --- a/voxygen/src/anim/character/roll.rs +++ b/voxygen/src/anim/character/roll.rs @@ -16,9 +16,10 @@ impl Animation for RollAnimation { skeleton: &Self::Skeleton, (_active_tool_kind, orientation, last_ori, _global_time): Self::Dependency, anim_time: f64, - _rate: &mut f32, + rate: &mut f32, skeleton_attr: &SkeletonAttr, ) -> Self::Skeleton { + *rate = 1.0; let mut next = (*skeleton).clone(); let wave = (anim_time as f32 * 5.5).sin(); diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs index 4091741ab7..512dc20d66 100644 --- a/voxygen/src/anim/mod.rs +++ b/voxygen/src/anim/mod.rs @@ -14,7 +14,7 @@ use crate::render::FigureBoneData; use common::comp::{self, ToolKind}; use vek::*; -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Debug)] pub struct Bone { pub offset: Vec3, pub ori: Quaternion, diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 34edd43a8c..7e9c0b3f37 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -407,24 +407,6 @@ impl FigureMgr { &mut state_animation_rate, skeleton_attr, ), - CharacterState::Wielding(_) => { - anim::character::WieldAnimation::update_skeleton( - &target_base, - (active_tool_kind, vel.0.magnitude(), time), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ) - } - CharacterState::Wielded(_) => { - anim::character::WieldAnimation::update_skeleton( - &target_base, - (active_tool_kind, vel.0.magnitude(), time), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ) - } /*CharacterState::Block(_) => { anim::character::BlockIdleAnimation::update_skeleton( &target_base,