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

Fmt and clippy from toolchain rebase.

Browse Source
This commit is contained in:
Sam 2021-06-02 18:06:58 -05:00
parent e835cb1392
commit f066f844b6
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
voxygen/anim/src/biped_large/alpha.rs
View File

@ -233,7 +233,6 @@ impl Animation for AlphaAnimation {
Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_z(0.35);
next.shoulder_r.orientation = Quaternion::rotation_x(0.0);
next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
} else {
next.head.orientation = Quaternion::rotation_z(move1 * -0.75);
next.upper_torso.orientation =
@ -263,8 +262,8 @@ impl Animation for AlphaAnimation {
* Quaternion::rotation_z(-0.35);
next.shoulder_l.orientation = Quaternion::rotation_x(0.0);
next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
};
next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
},
"Minotaur" => {
next.control_l.position = Vec3::new(0.0, 4.0, 5.0);

1
voxygen/anim/src/biped_large/beam.rs
View File

@ -11,6 +11,7 @@ use std::f32::consts::PI;
pub struct BeamAnimation;
impl Animation for BeamAnimation {
#[allow(clippy::type_complexity)]
type Dependency<'a> = (
(Option<ToolKind>, Option<&'a AbilitySpec>),
(Option<ToolKind>, Option<&'a AbilitySpec>),

8
voxygen/anim/src/biped_large/stunned.rs
View File

@ -213,9 +213,11 @@ impl Animation for StunnedAnimation {
Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(0.15);
},
"Tidal Warrior" => {
next.head.orientation = Quaternion::rotation_x(move1 * -2.0);
next.upper_torso.orientation = Quaternion::rotation_z(move1 * 1.0);
next.lower_torso.orientation = Quaternion::rotation_z(move1 * -1.0);
next.head.orientation = Quaternion::rotation_x(movement1 * -2.0);
next.upper_torso.orientation =
Quaternion::rotation_z(movement1 * 1.0);
next.lower_torso.orientation =
Quaternion::rotation_z(movement1 * -1.0);
next.hand_l.position = Vec3::new(-14.0, 2.0, -4.0);
next.hand_r.position = Vec3::new(14.0, 2.0, -4.0);

1
voxygen/anim/src/biped_large/summon.rs
View File

@ -11,6 +11,7 @@ use std::f32::consts::PI;
pub struct SummonAnimation;
impl Animation for SummonAnimation {
#[allow(clippy::type_complexity)]
type Dependency<'a> = (
(Option<ToolKind>, Option<&'a AbilitySpec>),
(Option<ToolKind>, Option<&'a AbilitySpec>),