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

Skewer

Browse Source
This commit is contained in:
uniior 2024-06-26 16:28:32 -04:00
parent 67691eda44
commit d9ff439ffe
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -628,20 +628,27 @@ 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 * 1.2); next.chest.orientation =
next.head.orientation = Quaternion::rotation_z(move1 * -0.7); Quaternion::rotation_y(move1 * 0.1 + move2 * -0.15)
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.6); * Quaternion::rotation_z(move1 * 1.2);
next.chest.position += Vec3::new(0.0, move1 * 3.0, 0.0);
next.head.orientation =
Quaternion::rotation_x(move1 * 0.1 + move2 * -0.2)
* Quaternion::rotation_y(move1 * 0.3 + move2 * -0.36)
* Quaternion::rotation_z(move1 * -0.3 + move2 * -0.72);
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.5);
next.belt.orientation = Quaternion::rotation_z(move1 * -0.2); next.belt.orientation = Quaternion::rotation_z(move1 * -0.2);
next.control.orientation.rotate_x(move1 * -1.0); next.control.orientation.rotate_x(move1 * -1.0);
next.control.orientation.rotate_z(move1 * -1.2); next.control.orientation.rotate_z(move1 * -1.2);
next.control.position += Vec3::new(0.0, move1 * -6.0, 2.0);
next.foot_r.position += Vec3::new(move1 * -1.0, move1 * 6.0, 0.0); next.foot_r.position += Vec3::new(move1 * -1.0, move1 * 6.0, 0.0);
next.chest.orientation.rotate_z(move2 * -1.4); next.chest.orientation.rotate_z(move2 * -1.4);
next.head.orientation.rotate_z(move2 * 0.9); next.head.orientation.rotate_z(move2 * 1.1);
next.shorts.orientation.rotate_z(move2 * 0.8); next.shorts.orientation.rotate_z(move2 * 0.8);
next.belt.orientation.rotate_z(move2 * 0.3); next.belt.orientation.rotate_z(move2 * 0.4);
next.control.orientation.rotate_z(move2 * 1.4); next.control.orientation.rotate_z(move2 * 1.4);
next.control.position += Vec3::new(0.0, move2 * 10.0, 0.0); next.control.position += Vec3::new(0.0, move2 * 12.0, 0.0);
}, },
Some( Some(
"common.abilities.sword.basic_cascade" "common.abilities.sword.basic_cascade"