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

clippy

Browse Source
This commit is contained in:
jshipsey 2020-09-17 22:58:02 -04:00
parent 90e5bbaac0
commit 8330d087e6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/agent.rs
View File

@ -124,9 +124,7 @@ impl<'a> From<&'a Body> for Psyche {
Body::BipedLarge(_) => 1.0,
Body::Object(_) => 1.0,
Body::Golem(_) => 1.0,
Body::Theropod(theropod) => match theropod.species {
_ => 0.4,
},
Body::Theropod(_) => 1.0,
Body::Dragon(_) => 1.0,
},
}

6
voxygen/src/anim/src/golem/shockwave.rs
View File

@ -37,7 +37,7 @@ impl Animation for ShockwaveAnimation {
+ 1.0;
next.head.position = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1) * 1.02;
next.head.orientation =
Quaternion::rotation_z((-twist * 2.0).max(-3.14)) * Quaternion::rotation_x(0.0);
Quaternion::rotation_z((-twist * 2.0).max(-PI)) * Quaternion::rotation_x(0.0);
next.head.scale = Vec3::one() * 1.02;
next.upper_torso.position = Vec3::new(
@ -46,7 +46,7 @@ impl Animation for ShockwaveAnimation {
skeleton_attr.upper_torso.1 + slower * -3.0 + breathe * 1.0,
) / 8.0;
next.upper_torso.orientation =
Quaternion::rotation_z((twist * 2.0).min(3.14)) * Quaternion::rotation_x(0.0);
Quaternion::rotation_z((twist * 2.0).min(PI)) * Quaternion::rotation_x(0.0);
next.upper_torso.scale = Vec3::one() / 8.0;
next.lower_torso.position = Vec3::new(
@ -55,7 +55,7 @@ impl Animation for ShockwaveAnimation {
skeleton_attr.lower_torso.1 + slower * 1.0,
);
next.lower_torso.orientation =
Quaternion::rotation_z((-twist * 2.0).max(-3.14)) * Quaternion::rotation_x(0.0);
Quaternion::rotation_z((-twist * 2.0).max(-PI)) * Quaternion::rotation_x(0.0);
next.lower_torso.scale = Vec3::one();
next.shoulder_l.position = Vec3::new(