aboutsummaryrefslogtreecommitdiff
path: root/src/dynamics/solver
diff options
context:
space:
mode:
authorSébastien Crozet <developer@crozet.re>2021-02-04 18:20:27 +0100
committerGitHub <noreply@github.com>2021-02-04 18:20:27 +0100
commita272f4ce9eb812bd14114fe95ab614bc8dddfce5 (patch)
tree216e07441b294f4424c49d92d1e74e1d94772cbb /src/dynamics/solver
parenta0230408252c9e3f06d4cee4c45831922df0143e (diff)
parent85bc81d4fce29bf628d31cb978aa482e564aab90 (diff)
downloadrapier-a272f4ce9eb812bd14114fe95ab614bc8dddfce5.tar.gz
rapier-a272f4ce9eb812bd14114fe95ab614bc8dddfce5.tar.bz2
rapier-a272f4ce9eb812bd14114fe95ab614bc8dddfce5.zip
Merge pull request #104 from EmbarkStudios/clippy-fixes
Make clippy a bit happier
Diffstat (limited to 'src/dynamics/solver')
-rw-r--r--src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs4
-rw-r--r--src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs4
-rw-r--r--src/dynamics/solver/joint_constraint/revolute_position_constraint.rs4
-rw-r--r--src/dynamics/solver/joint_constraint/revolute_velocity_constraint.rs4
-rw-r--r--src/dynamics/solver/joint_constraint/revolute_velocity_constraint_wide.rs4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs
index d1943fc..a361a37 100644
--- a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs
+++ b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint.rs
@@ -84,7 +84,7 @@ impl PrismaticVelocityConstraint {
// .into_inner();
// #[cfg(feature = "dim3")]
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
@@ -380,7 +380,7 @@ impl PrismaticVelocityGroundConstraint {
// .into_inner();
// #[cfg(feature = "dim3")]
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
diff --git a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs
index f24cfa5..77a6fe7 100644
--- a/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs
+++ b/src/dynamics/solver/joint_constraint/prismatic_velocity_constraint_wide.rs
@@ -124,7 +124,7 @@ impl WPrismaticVelocityConstraint {
// .into_inner();
// #[cfg(feature = "dim3")]
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
@@ -483,7 +483,7 @@ impl WPrismaticVelocityGroundConstraint {
// .into_inner();
// #[cfg(feature = "dim3")]
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
diff --git a/src/dynamics/solver/joint_constraint/revolute_position_constraint.rs b/src/dynamics/solver/joint_constraint/revolute_position_constraint.rs
index 19dd451..afc23f3 100644
--- a/src/dynamics/solver/joint_constraint/revolute_position_constraint.rs
+++ b/src/dynamics/solver/joint_constraint/revolute_position_constraint.rs
@@ -56,7 +56,7 @@ impl RevolutePositionConstraint {
let axis1 = position1 * self.local_axis1;
let axis2 = position2 * self.local_axis2;
let delta_rot =
- Rotation::rotation_between_axis(&axis1, &axis2).unwrap_or(Rotation::identity());
+ Rotation::rotation_between_axis(&axis1, &axis2).unwrap_or_else(Rotation::identity);
let ang_error = delta_rot.scaled_axis() * params.joint_erp;
let ang_impulse = self.ang_inv_lhs.transform_vector(ang_error);
@@ -129,7 +129,7 @@ impl RevolutePositionGroundConstraint {
let delta_rot =
Rotation::scaled_rotation_between_axis(&axis2, &self.axis1, params.joint_erp)
- .unwrap_or(Rotation::identity());
+ .unwrap_or_else(Rotation::identity);
position2.rotation = delta_rot * position2.rotation;
let anchor2 = position2 * self.local_anchor2;
diff --git a/src/dynamics/solver/joint_constraint/revolute_velocity_constraint.rs b/src/dynamics/solver/joint_constraint/revolute_velocity_constraint.rs
index 38f56d9..6270a8e 100644
--- a/src/dynamics/solver/joint_constraint/revolute_velocity_constraint.rs
+++ b/src/dynamics/solver/joint_constraint/revolute_velocity_constraint.rs
@@ -46,7 +46,7 @@ impl RevoluteVelocityConstraint {
]);
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
@@ -208,7 +208,7 @@ impl RevoluteVelocityGroundConstraint {
};
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = /*r21 * */ basis1;
diff --git a/src/dynamics/solver/joint_constraint/revolute_velocity_constraint_wide.rs b/src/dynamics/solver/joint_constraint/revolute_velocity_constraint_wide.rs
index 822c2ac..047763d 100644
--- a/src/dynamics/solver/joint_constraint/revolute_velocity_constraint_wide.rs
+++ b/src/dynamics/solver/joint_constraint/revolute_velocity_constraint_wide.rs
@@ -73,7 +73,7 @@ impl WRevoluteVelocityConstraint {
Matrix3x2::from_columns(&[position1 * local_basis1[0], position1 * local_basis1[1]]);
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = r21 * basis1;
@@ -290,7 +290,7 @@ impl WRevoluteVelocityGroundConstraint {
let anchor2 = position2 * local_anchor2;
// let r21 = Rotation::rotation_between_axis(&axis1, &axis2)
- // .unwrap_or(Rotation::identity())
+ // .unwrap_or_else(Rotation::identity)
// .to_rotation_matrix()
// .into_inner();
// let basis2 = /*r21 * */ basis1;