diff --git a/common/src/sys/movement.rs b/common/src/sys/movement.rs index 8938510380..6f0471f0bb 100644 --- a/common/src/sys/movement.rs +++ b/common/src/sys/movement.rs @@ -9,8 +9,8 @@ use vek::*; const HUMANOID_ACCEL: f32 = 70.0; const HUMANOID_SPEED: f32 = 120.0; -const WIELD_ACCEL: f32 = 60.0; -const WIELD_SPEED: f32 = 100.0; +const WIELD_ACCEL: f32 = 70.0; +const WIELD_SPEED: f32 = 120.0; const HUMANOID_AIR_ACCEL: f32 = 10.0; const HUMANOID_AIR_SPEED: f32 = 100.0; const HUMANOID_JUMP_ACCEL: f32 = 18.0; diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs index 7e6c7c1576..2bfd5c19b2 100644 --- a/voxygen/src/anim/character/attack.rs +++ b/voxygen/src/anim/character/attack.rs @@ -95,13 +95,13 @@ impl Animation for AttackAnimation { * Quaternion::rotation_y(0.0 + wave_quicken * -0.4); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/cidle.rs b/voxygen/src/anim/character/cidle.rs index c21ce75f9b..26aadb2665 100644 --- a/voxygen/src/anim/character/cidle.rs +++ b/voxygen/src/anim/character/cidle.rs @@ -239,13 +239,13 @@ impl Animation for CidleAnimation { next.r_foot.ori = Quaternion::rotation_x(wave_ultra_slow * 0.015); next.r_foot.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/cjump.rs b/voxygen/src/anim/character/cjump.rs index 33803d7e70..6f4cf9720d 100644 --- a/voxygen/src/anim/character/cjump.rs +++ b/voxygen/src/anim/character/cjump.rs @@ -182,13 +182,13 @@ impl Animation for CjumpAnimation { next.r_foot.ori = Quaternion::rotation_x(wave_stop * 1.2 + wave_slow * 0.2); next.r_foot.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/crun.rs b/voxygen/src/anim/character/crun.rs index b17da28f45..26cbe654fb 100644 --- a/voxygen/src/anim/character/crun.rs +++ b/voxygen/src/anim/character/crun.rs @@ -24,9 +24,7 @@ impl Animation for CrunAnimation { let wave = (anim_time as f32 * 12.0).sin(); let wave_cos = (anim_time as f32 * 12.0).cos(); let wave_diff = (anim_time as f32 * 12.0 + PI / 2.0).sin(); - let wave_dub = (anim_time as f32 * 16.0).sin(); - let wave_cos_dub = (anim_time as f32 * 16.0).cos(); - let wave_cos_foot = (anim_time as f32 * 14.0).cos(); + let wave_cos_dub = (anim_time as f32 * 24.0).cos(); let wave_stop = (anim_time as f32 * 5.0).min(PI / 2.0).sin(); let head_look = Vec2::new( @@ -52,11 +50,11 @@ impl Animation for CrunAnimation { next.head.scale = Vec3::one() * skeleton_attr.head_scale; next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + wave_cos * 1.1); - next.chest.ori = Quaternion::rotation_z(wave * 0.1); + next.chest.ori = Quaternion::rotation_z(wave * 0.15); next.chest.scale = Vec3::one(); next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + wave_cos * 1.1); - next.belt.ori = Quaternion::rotation_z(wave * 0.18); + next.belt.ori = Quaternion::rotation_z(wave * 0.25); next.belt.scale = Vec3::one(); next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + wave_cos * 1.1); @@ -189,21 +187,21 @@ impl Animation for CrunAnimation { next.weapon.scale = Vec3::one(); } } - next.l_foot.offset = Vec3::new(-3.4, 0.0 + wave_cos * 1.0, 7.2 - wave_dub * 0.25); - next.l_foot.ori = Quaternion::rotation_x(-0.0 - wave_cos_foot * 0.6); + next.l_foot.offset = Vec3::new(-3.4, 0.0 + wave_cos * 1.0, 6.0 - wave_cos_dub * 0.7); + next.l_foot.ori = Quaternion::rotation_x(-0.0 - wave_cos * 1.5); next.l_foot.scale = Vec3::one(); - next.r_foot.offset = Vec3::new(3.4, 0.0 - wave_cos * 1.0, 7.2 - wave_cos_dub * 0.25); - next.r_foot.ori = Quaternion::rotation_x(-0.0 + wave_cos_foot * 0.6); + next.r_foot.offset = Vec3::new(3.4, 0.0 - wave_cos * 1.0, 6.0 - wave_cos_dub * 0.7); + next.r_foot.ori = Quaternion::rotation_x(-0.0 + wave_cos * 1.5); next.r_foot.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); - next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); + next.l_shoulder.ori = Quaternion::rotation_x(wave_cos * 0.15); + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); - next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); + next.r_shoulder.ori = Quaternion::rotation_x(wave * 0.15); + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/gliding.rs b/voxygen/src/anim/character/gliding.rs index d3d0bb5985..2a66fbbc93 100644 --- a/voxygen/src/anim/character/gliding.rs +++ b/voxygen/src/anim/character/gliding.rs @@ -95,13 +95,13 @@ impl Animation for GlidingAnimation { next.weapon.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, -13.0 + wave_very_slow * 0.10, 6.0); next.draw.ori = Quaternion::rotation_x(1.0)//0.95 - wave_very_slow * 0.08) diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs index 76951d78ad..f5ab828a78 100644 --- a/voxygen/src/anim/character/idle.rs +++ b/voxygen/src/anim/character/idle.rs @@ -91,13 +91,13 @@ impl Animation for IdleAnimation { next.weapon.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs index 88b209c0af..9360cc7568 100644 --- a/voxygen/src/anim/character/jump.rs +++ b/voxygen/src/anim/character/jump.rs @@ -75,13 +75,13 @@ impl Animation for JumpAnimation { next.weapon.ori = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); - next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); + next.l_shoulder.ori = Quaternion::rotation_x(wave_stop_alt * 0.3); + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); - next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); + next.r_shoulder.ori = Quaternion::rotation_x(-wave_stop_alt * 0.3); + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs index 4619b8118c..fd5989b1d6 100644 --- a/voxygen/src/anim/character/roll.rs +++ b/voxygen/src/anim/character/roll.rs @@ -82,13 +82,13 @@ impl Animation for RollAnimation { * Quaternion::rotation_x(0.0); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs index c5ef1654fd..be4d9c802a 100644 --- a/voxygen/src/anim/character/run.rs +++ b/voxygen/src/anim/character/run.rs @@ -49,11 +49,11 @@ impl Animation for RunAnimation { next.head.scale = Vec3::one() * skeleton_attr.head_scale; next.chest.offset = Vec3::new(0.0, 0.0, 7.0 + wave_cos * 1.1); - next.chest.ori = Quaternion::rotation_z(wave * 0.1); + next.chest.ori = Quaternion::rotation_z(wave * 0.2); next.chest.scale = Vec3::one(); next.belt.offset = Vec3::new(0.0, 0.0, 5.0 + wave_cos * 1.1); - next.belt.ori = Quaternion::rotation_z(wave * 0.25); + next.belt.ori = Quaternion::rotation_z(wave * 0.35); next.belt.scale = Vec3::one(); next.shorts.offset = Vec3::new(0.0, 0.0, 2.0 + wave_cos * 1.1); @@ -93,20 +93,19 @@ impl Animation for RunAnimation { Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + wave_cos * 0.25); next.weapon.scale = Vec3::one(); - next.l_shoulder.offset = Vec3::new(-10.0, -3.2, 2.5); - next.l_shoulder.ori = Quaternion::rotation_x(0.0); - next.l_shoulder.scale = Vec3::one() * 1.04; + next.l_shoulder.offset = Vec3::new(-5.0, 0.0, 4.7); + next.l_shoulder.ori = Quaternion::rotation_x(wave_cos * 0.15); + next.l_shoulder.scale = Vec3::one() * 1.1; - next.r_shoulder.offset = Vec3::new(0.0, -3.2, 2.5); - next.r_shoulder.ori = Quaternion::rotation_x(0.0); - next.r_shoulder.scale = Vec3::one() * 1.04; + next.r_shoulder.offset = Vec3::new(5.0, 0.0, 4.7); + next.r_shoulder.ori = Quaternion::rotation_x(wave * 0.15); + next.r_shoulder.scale = Vec3::one() * 1.1; next.draw.offset = Vec3::new(0.0, 5.0, 0.0); next.draw.ori = Quaternion::rotation_y(0.0); next.draw.scale = Vec3::one() * 0.0; - next.torso.offset = - Vec3::new(0.0, -0.2 + wave * -0.08, 0.4 + wave_cos_dub * 0.07) * skeleton_attr.scaler; + next.torso.offset = Vec3::new(0.0, -0.2 + wave * -0.08, 0.4) * skeleton_attr.scaler; next.torso.ori = Quaternion::rotation_x(wave_stop * velocity * -0.06 + wave_diff * velocity * -0.005); next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler; diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 1c7f8666aa..94275944a9 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -309,7 +309,7 @@ impl FigureModelCache { humanoid::Shoulder::None => "figure.empty", humanoid::Shoulder::Brown1 => "armor.shoulder.shoulder_l_brown", }, - Vec3::new(2.5, -0.5, 0.0), + Vec3::new(-2.5, -3.5, -1.5), ) } @@ -319,7 +319,7 @@ impl FigureModelCache { humanoid::Shoulder::None => "figure.empty", humanoid::Shoulder::Brown1 => "armor.shoulder.shoulder_r_brown", }, - Vec3::new(2.5, -0.5, 0.0), + Vec3::new(-2.5, -3.5, -1.5), ) }