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

Correct shoulder orientation when holding lantern

Browse Source
This commit is contained in:
Joshua Barretto 2023-10-12 18:13:46 +01:00
parent 1d33d7e4c4
commit dc6c5190f2
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
voxygen/anim/src/character/run.rs
View File

@ -275,6 +275,7 @@ impl Animation for RunAnimation {
s_a.hand.2 + 12.0 + impact * -0.1, s_a.hand.2 + 12.0 + impact * -0.1,
); );
next.hand_r.orientation = Quaternion::rotation_x(2.25) * Quaternion::rotation_z(0.9); next.hand_r.orientation = Quaternion::rotation_x(2.25) * Quaternion::rotation_z(0.9);
next.shoulder_r.orientation = Quaternion::rotation_x(short * -0.15 + 2.0);
let fast = (anim_time * 8.0).sin(); let fast = (anim_time * 8.0).sin();
let fast2 = (anim_time * 6.0 + 8.0).sin(); let fast2 = (anim_time * 6.0 + 8.0).sin();

1
voxygen/anim/src/character/stand.rs
View File

@ -185,6 +185,7 @@ impl Animation for StandAnimation {
* Quaternion::rotation_z(0.9) * Quaternion::rotation_z(0.9)
* Quaternion::rotation_y(head_look.x * 1.5) * Quaternion::rotation_y(head_look.x * 1.5)
* Quaternion::rotation_x(head_look.y * 1.5); * Quaternion::rotation_x(head_look.y * 1.5);
next.shoulder_r.orientation = Quaternion::rotation_x(slow * 0.15 + 2.0);
let fast = (anim_time * 5.0).sin(); let fast = (anim_time * 5.0).sin();
let fast2 = (anim_time * 4.5 + 8.0).sin(); let fast2 = (anim_time * 4.5 + 8.0).sin();