diff options
| author | Sébastien Crozet <sebcrozet@dimforge.com> | 2024-01-27 16:49:53 +0100 |
|---|---|---|
| committer | Sébastien Crozet <sebastien@crozet.re> | 2024-01-27 17:13:08 +0100 |
| commit | da92e5c2837b27433286cf0dd9d887fd44dda254 (patch) | |
| tree | 00428ce290288f5c64e53dee13d88ffdde4df0ca /src/dynamics/rigid_body.rs | |
| parent | aef873f20e7a1ee66b9d4c066884fa794048587b (diff) | |
| download | rapier-da92e5c2837b27433286cf0dd9d887fd44dda254.tar.gz rapier-da92e5c2837b27433286cf0dd9d887fd44dda254.tar.bz2 rapier-da92e5c2837b27433286cf0dd9d887fd44dda254.zip | |
Fix clippy and enable clippy on CI
Diffstat (limited to 'src/dynamics/rigid_body.rs')
| -rw-r--r-- | src/dynamics/rigid_body.rs | 58 |
1 files changed, 25 insertions, 33 deletions
diff --git a/src/dynamics/rigid_body.rs b/src/dynamics/rigid_body.rs index b462f8b..b27b58e 100644 --- a/src/dynamics/rigid_body.rs +++ b/src/dynamics/rigid_body.rs @@ -300,16 +300,16 @@ impl RigidBody { wake_up: bool, ) { #[cfg(feature = "dim2")] - if self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_X) == !allow_translation_x - && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Y) == !allow_translation_y + if self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_X) != allow_translation_x + && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Y) != allow_translation_y { // Nothing to change. return; } #[cfg(feature = "dim3")] - if self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_X) == !allow_translation_x - && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Y) == !allow_translation_y - && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Z) == !allow_translation_z + if self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_X) != allow_translation_x + && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Y) != allow_translation_y + && self.mprops.flags.contains(LockedAxes::TRANSLATION_LOCKED_Z) != allow_translation_z { // Nothing to change. return; @@ -850,13 +850,11 @@ impl RigidBody { /// /// This does nothing on non-dynamic bodies. pub fn add_force(&mut self, force: Vector<Real>, wake_up: bool) { - if !force.is_zero() { - if self.body_type == RigidBodyType::Dynamic { - self.forces.user_force += force; + if !force.is_zero() && self.body_type == RigidBodyType::Dynamic { + self.forces.user_force += force; - if wake_up { - self.wake_up(true); - } + if wake_up { + self.wake_up(true); } } } @@ -866,13 +864,11 @@ impl RigidBody { /// This does nothing on non-dynamic bodies. #[cfg(feature = "dim2")] pub fn add_torque(&mut self, torque: Real, wake_up: bool) { - if !torque.is_zero() { - if self.body_type == RigidBodyType::Dynamic { - self.forces.user_torque += torque; + if !torque.is_zero() && self.body_type == RigidBodyType::Dynamic { + self.forces.user_torque += torque; - if wake_up { - self.wake_up(true); - } + if wake_up { + self.wake_up(true); } } } @@ -882,13 +878,11 @@ impl RigidBody { /// This does nothing on non-dynamic bodies. #[cfg(feature = "dim3")] pub fn add_torque(&mut self, torque: Vector<Real>, wake_up: bool) { - if !torque.is_zero() { - if self.body_type == RigidBodyType::Dynamic { - self.forces.user_torque += torque; + if !torque.is_zero() && self.body_type == RigidBodyType::Dynamic { + self.forces.user_torque += torque; - if wake_up { - self.wake_up(true); - } + if wake_up { + self.wake_up(true); } } } @@ -897,14 +891,12 @@ impl RigidBody { /// /// This does nothing on non-dynamic bodies. pub fn add_force_at_point(&mut self, force: Vector<Real>, point: Point<Real>, wake_up: bool) { - if !force.is_zero() { - if self.body_type == RigidBodyType::Dynamic { - self.forces.user_force += force; - self.forces.user_torque += (point - self.mprops.world_com).gcross(force); + if !force.is_zero() && self.body_type == RigidBodyType::Dynamic { + self.forces.user_force += force; + self.forces.user_torque += (point - self.mprops.world_com).gcross(force); - if wake_up { - self.wake_up(true); - } + if wake_up { + self.wake_up(true); } } } @@ -1379,8 +1371,8 @@ impl RigidBodyBuilder { } } -impl Into<RigidBody> for RigidBodyBuilder { - fn into(self) -> RigidBody { - self.build() +impl From<RigidBodyBuilder> for RigidBody { + fn from(val: RigidBodyBuilder) -> RigidBody { + val.build() } } |
