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

Better gliding

Browse Source
This commit is contained in:
Joshua Barretto 2023-10-12 12:34:17 +01:00
parent d5565c4a41
commit d52f3af727
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
voxygen/anim/src/character/gliding.rs
View File

@ -29,7 +29,7 @@ impl Animation for GlidingAnimation {
next.glider_trails = true; next.glider_trails = true;
let speednorm = velocity.magnitude().min(50.0) / 50.0; let speednorm = velocity.magnitude().min(50.0) / 50.0;
let slow = (acc_vel * 0.5).sin(); let slow = (acc_vel * 0.25).sin();
let head_look = Vec2::new( let head_look = Vec2::new(
((global_time + anim_time) / 4.0).floor().mul(7331.0).sin() * 0.5, ((global_time + anim_time) / 4.0).floor().mul(7331.0).sin() * 0.5,
@ -56,6 +56,7 @@ impl Animation for GlidingAnimation {
next.shorts.orientation = Quaternion::rotation_z(0.0); next.shorts.orientation = Quaternion::rotation_z(0.0);
next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1); next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1);
next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1); next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
next.shorts.orientation = Quaternion::rotation_z(-speedlog + slow * 0.15);
next.hand_l.position = next.hand_l.position =
glider_pos + glider_ori * Vec3::new(-s_a.hand.0 + -2.0, s_a.hand.1 + 8.0, s_a.hand.2); glider_pos + glider_ori * Vec3::new(-s_a.hand.0 + -2.0, s_a.hand.1 + 8.0, s_a.hand.2);
@ -65,11 +66,19 @@ impl Animation for GlidingAnimation {
glider_pos + glider_ori * Vec3::new(s_a.hand.0 + 2.0, s_a.hand.1 + 8.0, s_a.hand.2); glider_pos + glider_ori * Vec3::new(s_a.hand.0 + 2.0, s_a.hand.1 + 8.0, s_a.hand.2);
next.hand_r.orientation = Quaternion::rotation_x(3.35) * Quaternion::rotation_y(-0.2); next.hand_r.orientation = Quaternion::rotation_x(3.35) * Quaternion::rotation_y(-0.2);
next.foot_l.position = Vec3::new(-s_a.foot.0, s_a.foot.1 + speedlog * -1.0, s_a.foot.2); next.foot_l.position = Vec3::new(
next.foot_l.orientation = Quaternion::rotation_x(-speedlog + slow * -0.3 * speedlog); -s_a.foot.0,
s_a.foot.1 + speedlog * -1.0 - slow * 2.3,
s_a.foot.2,
);
next.foot_l.orientation = Quaternion::rotation_x(-speedlog + slow * -1.3 * speedlog);
next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1 + speedlog * -1.0, s_a.foot.2); next.foot_r.position = Vec3::new(
next.foot_r.orientation = Quaternion::rotation_x(-speedlog + slow * 0.3 * speedlog); s_a.foot.0,
s_a.foot.1 + speedlog * -1.0 + slow * 2.3,
s_a.foot.2,
);
next.foot_r.orientation = Quaternion::rotation_x(-speedlog + slow * 1.3 * speedlog);
next next
} }

5
voxygen/anim/src/character/jump.rs
View File

@ -37,6 +37,7 @@ impl Animation for JumpAnimation {
let check = subtract - subtract.trunc(); let check = subtract - subtract.trunc();
let switch = (check - 0.5).signum(); let switch = (check - 0.5).signum();
let falling = (velocity.z * 0.1).clamped(-1.0, 1.0);
let speed = Vec2::<f32>::from(velocity).magnitude(); let speed = Vec2::<f32>::from(velocity).magnitude();
let speednorm = (speed / 10.0).min(1.0); let speednorm = (speed / 10.0).min(1.0);
@ -115,14 +116,14 @@ impl Animation for JumpAnimation {
next.foot_l.position = Vec3::new( next.foot_l.position = Vec3::new(
-s_a.foot.0, -s_a.foot.0,
s_a.foot.1 - 5.0 * switch, s_a.foot.1 - 5.0 * switch,
2.0 + s_a.foot.2 + slow * 1.5, 2.0 + s_a.foot.2 + slow * 1.5 + falling * -2.0,
); );
next.foot_l.orientation = Quaternion::rotation_x(-0.8 * switch + slow * -0.2 * switch); next.foot_l.orientation = Quaternion::rotation_x(-0.8 * switch + slow * -0.2 * switch);
next.foot_r.position = Vec3::new( next.foot_r.position = Vec3::new(
s_a.foot.0, s_a.foot.0,
s_a.foot.1 + 5.0 * switch, s_a.foot.1 + 5.0 * switch,
2.0 + s_a.foot.2 + slow * 1.5, 2.0 + s_a.foot.2 + slow * 1.5 + falling * -2.0,
); );
next.foot_r.orientation = Quaternion::rotation_x(0.8 * switch + slow * 0.2 * switch); next.foot_r.orientation = Quaternion::rotation_x(0.8 * switch + slow * 0.2 * switch);