Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

animation tweaking

Browse Source
This commit is contained in:
jshipsey 2022-01-16 15:46:17 -05:00
parent 7f3d9898db
commit 0ea1e6862e
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
voxygen/anim/src/character/mount.rs
View File

@ -65,7 +65,7 @@ impl Animation for MountAnimation {
let speed = (Vec2::<f32>::from(velocity).magnitude()).min(24.0);
let canceler = (speed / 24.0).powf(0.6);
let _x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()) * canceler;
let _tilt = if ::vek::Vec2::new(ori, last_ori)
let tilt = if ::vek::Vec2::new(ori, last_ori)
.map(|o| o.magnitude_squared())
.map(|m| m > 0.001 && m.is_finite())
.reduce_and()
@ -88,19 +88,36 @@ impl Animation for MountAnimation {
next.shoulder_r.scale = Vec3::one() * 1.1;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slow * 0.1 + stop * -0.8);
next.head.orientation = Quaternion::rotation_z(head_look.x + slow * 0.2 - slow * 0.1)
* Quaternion::rotation_x((0.4 + slowa * -0.1 + slow * 0.1 + head_look.y).abs());
next.head.orientation =
Quaternion::rotation_z(head_look.x + slow * 0.2 - slow * 0.1 + tilt * -2.0)
* Quaternion::rotation_x(
(canceler * 0.3
+ 0.4
+ slowa * -0.1
+ slow * 0.1
+ head_look.y
+ tilt.abs() * 1.2)
.abs(),
);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
next.chest.orientation = Quaternion::rotation_x(-0.6 + stop * 0.15);
next.chest.orientation =
Quaternion::rotation_x(-0.6 + stop * 0.15 + canceler * -0.3 + tilt.abs() * -1.5)
* Quaternion::rotation_y(tilt * 2.0);
next.belt.position = Vec3::new(0.0, s_a.belt.0 + stop * 1.2, s_a.belt.1);
next.belt.orientation = Quaternion::rotation_x(stop * 0.3);
next.belt.position = Vec3::new(0.0, s_a.belt.0 + stop * 1.2, s_a.belt.1 + 1.0);
next.belt.orientation =
Quaternion::rotation_x(stop * 0.3) * Quaternion::rotation_y(tilt * -0.5);
next.back.position = Vec3::new(0.0, s_a.back.0, s_a.back.1);
next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + stop * 2.5, s_a.shorts.1 + stop * 0.6);
next.shorts.orientation = Quaternion::rotation_x(stop * 0.6);
next.shorts.position = Vec3::new(
0.0,
s_a.shorts.0 + stop * 2.5 + 1.0,
s_a.shorts.1 + stop * 0.6 + 2.0,
);
next.shorts.orientation =
Quaternion::rotation_x(stop * 0.6) * Quaternion::rotation_y(tilt * -1.0);
next.hand_l.position = Vec3::new(
-s_a.hand.0 + 4.0,

12
voxygen/anim/src/quadruped_medium/jump.rs
View File

@ -34,11 +34,11 @@ impl Animation for JumpAnimation {
next.foot_br.scale = Vec3::one() * 0.96;
next.ears.scale = Vec3::one() * 1.02;
let speed = Vec2::<f32>::from(velocity).magnitude();
let velocityalt = speed.max(1.0);
let velocityalt = speed.max(3.0);
let normalize = velocityalt / 22.0;
let x_tilt = (avg_vel.z.atan2(avg_vel.xy().magnitude()) * normalize).max(-0.35);
let x_tilt = if velocityalt < 2.0 {
let x_tilt = (avg_vel.z.atan2(avg_vel.xy().magnitude()) * normalize).max(-0.28);
let x_tilt = if velocityalt < 3.5 {
x_tilt.abs()
} else {
x_tilt
@ -57,7 +57,7 @@ impl Animation for JumpAnimation {
next.tail.orientation = Quaternion::rotation_x(-0.6 * normalize + x_tilt * 2.0);
next.torso_front.position = Vec3::new(0.0, s_a.torso_front.0, s_a.torso_front.1);
next.torso_front.orientation = Quaternion::rotation_x(x_tilt * 1.9);
next.torso_front.orientation = Quaternion::rotation_x(x_tilt * 3.5);
next.torso_back.position = Vec3::new(0.0, s_a.torso_back.0, s_a.torso_back.1);
next.torso_back.orientation = Quaternion::rotation_x(x_tilt * -1.2);
@ -66,10 +66,10 @@ impl Animation for JumpAnimation {
next.ears.orientation = Quaternion::rotation_x(x_tilt * 1.5);
next.leg_fl.position = Vec3::new(-s_a.leg_f.0, s_a.leg_f.1, s_a.leg_f.2);
next.leg_fl.orientation = Quaternion::rotation_x(1.2 * normalize + x_tilt * 0.8);
next.leg_fl.orientation = Quaternion::rotation_x(1.2 * normalize + x_tilt.abs() * 0.8);
next.leg_fr.position = Vec3::new(s_a.leg_f.0, s_a.leg_f.1, s_a.leg_f.2);
next.leg_fr.orientation = Quaternion::rotation_x(1.2 * normalize + x_tilt * 0.8);
next.leg_fr.orientation = Quaternion::rotation_x(1.2 * normalize + x_tilt.abs() * 0.8);
next.leg_bl.position = Vec3::new(-s_a.leg_b.0, s_a.leg_b.1, s_a.leg_b.2);
next.leg_bl.orientation = Quaternion::rotation_x(-0.8 * normalize + x_tilt * -0.8);