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

Cascade

Browse Source
This commit is contained in:
uniior 2024-06-29 12:40:21 -04:00
parent d9ff439ffe
commit 4b0e31a91d
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
voxygen/anim/src/character/multi.rs
View File

@ -673,14 +673,26 @@ impl Animation for MultiAction {
next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2); next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
next.control.orientation = Quaternion::rotation_x(s_a.sc.3); next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
next.chest.orientation = Quaternion::rotation_z(move1 * 0.2); next.chest.orientation =
next.control.orientation.rotate_x(move1 * 1.5); Quaternion::rotation_y(move1 * 0.1 + move2 * -0.15)
next.control.position += Vec3::new(move1 * 1.0, move1 * 4.0, move1 * 11.0); * Quaternion::rotation_z(move1 * 0.4 + move2 * -0.5);
next.chest.position += Vec3::new(0.0, move1 * -1.0, 0.0);
next.head.orientation =
Quaternion::rotation_x(move1 * 0.1 + move2 * -0.24)
* Quaternion::rotation_y(move1 * -0.2 + move2 * 0.36)
* Quaternion::rotation_z(move1 * -0.1 + move2 * -0.96);
next.control.orientation.rotate_x(move1 * 1.7);
next.control.position += Vec3::new(0.0, move1 * 6.0, move1 * 16.0);
next.foot_l.orientation = Quaternion::rotation_z(move1 * 0.2);
next.foot_l.position += Vec3::new(0.0, move2 * 2.5, 0.0);
next.foot_r.position += Vec3::new(0.0, move2 * -0.5, 0.0);
next.chest.orientation.rotate_z(move2 * -0.5); next.chest.orientation.rotate_z(move2 * -0.5);
next.chest.position += Vec3::new(0.0, move2 * 4.0, 0.0);
next.head.orientation.rotate_z(move2 * 1.4);
next.control.orientation.rotate_z(move2 * -0.3); next.control.orientation.rotate_z(move2 * -0.3);
next.control.orientation.rotate_x(move2 * -2.9); next.control.orientation.rotate_x(move2 * -3.4);
next.control.position += Vec3::new(move2 * 7.0, move2 * -3.0, move2 * -15.0); next.control.position += Vec3::new(move2 * 6.0, move2 * -7.0, move2 * -18.0);
}, },
Some( Some(
"common.abilities.sword.basic_cross_cut" "common.abilities.sword.basic_cross_cut"