From c18d7c72f4bcc759aaea5d33e6f2fb8133d82176 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 16 Jun 2019 11:54:02 -0400 Subject: [PATCH] lowered roll duration --- common/src/sys/phys.rs | 2 +- voxygen/src/anim/character/roll.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs index a72d338c48..09d0b7a794 100644 --- a/common/src/sys/phys.rs +++ b/common/src/sys/phys.rs @@ -132,7 +132,7 @@ impl<'a> System<'a> for Sys { // Roll if let Some(time) = rollings.get_mut(entity).map(|r| &mut r.time) { *time += dt.0; - if *time > 0.7 { + if *time > 0.55 { rollings.remove(entity); } } diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs index 2dc242ac0b..f5fa454ab8 100644 --- a/voxygen/src/anim/character/roll.rs +++ b/voxygen/src/anim/character/roll.rs @@ -15,12 +15,12 @@ impl Animation for RollAnimation { ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let wave = (anim_time as f32 * 4.0).sin(); - let wave_quick = (anim_time as f32 * 7.0).sin(); - let wave_quick_cos = (anim_time as f32 * 7.0).cos(); - let wave_cos = (anim_time as f32 * 4.0).cos(); - let wave_slow = (anim_time as f32 * 2.0 + PI).sin(); - let wave_dub = (anim_time as f32 * 4.0).sin(); + let wave = (anim_time as f32 * 5.5).sin(); + let wave_quick = (anim_time as f32 * 9.5).sin(); + let wave_quick_cos = (anim_time as f32 * 9.5).cos(); + let wave_cos = (anim_time as f32 * 5.5).cos(); + let wave_slow = (anim_time as f32 * 2.8 + PI).sin(); + let wave_dub = (anim_time as f32 * 5.5).sin(); next.head.offset = Vec3::new(0.0, 0.0 + wave_slow * -3.0, 9.0 + wave_dub * -5.0); next.head.ori = Quaternion::rotation_x(wave_dub * -0.4);