From 15b165893c718a5606622b05b36f8041a429e30c Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Mon, 21 Feb 2022 21:19:30 +0100 Subject: Use WReal instead of SimdRealField everywhere --- src/dynamics/solver/velocity_constraint_element.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/dynamics/solver/velocity_constraint_element.rs') diff --git a/src/dynamics/solver/velocity_constraint_element.rs b/src/dynamics/solver/velocity_constraint_element.rs index 2d2221d..30afef5 100644 --- a/src/dynamics/solver/velocity_constraint_element.rs +++ b/src/dynamics/solver/velocity_constraint_element.rs @@ -1,10 +1,9 @@ use super::DeltaVel; use crate::math::{AngVector, Vector, DIM}; -use crate::utils::{WBasis, WDot}; -use na::SimdRealField; +use crate::utils::{WBasis, WDot, WReal}; #[derive(Copy, Clone, Debug)] -pub(crate) struct VelocityConstraintTangentPart { +pub(crate) struct VelocityConstraintTangentPart { pub gcross1: [AngVector; DIM - 1], pub gcross2: [AngVector; DIM - 1], pub rhs: [N; DIM - 1], @@ -18,7 +17,7 @@ pub(crate) struct VelocityConstraintTangentPart { pub r: [N; DIM], } -impl VelocityConstraintTangentPart { +impl VelocityConstraintTangentPart { fn zero() -> Self { Self { gcross1: [na::zero(); DIM - 1], @@ -43,7 +42,6 @@ impl VelocityConstraintTangentPart { mj_lambda2: &mut DeltaVel, ) where AngVector: WDot, Result = N>, - N::Element: SimdRealField + Copy, { #[cfg(feature = "dim2")] { @@ -107,7 +105,7 @@ impl VelocityConstraintTangentPart { } #[derive(Copy, Clone, Debug)] -pub(crate) struct VelocityConstraintNormalPart { +pub(crate) struct VelocityConstraintNormalPart { pub gcross1: AngVector, pub gcross2: AngVector, pub rhs: N, @@ -116,7 +114,7 @@ pub(crate) struct VelocityConstraintNormalPart { pub r: N, } -impl VelocityConstraintNormalPart { +impl VelocityConstraintNormalPart { fn zero() -> Self { Self { gcross1: na::zero(), @@ -157,12 +155,12 @@ impl VelocityConstraintNormalPart { } #[derive(Copy, Clone, Debug)] -pub(crate) struct VelocityConstraintElement { +pub(crate) struct VelocityConstraintElement { pub normal_part: VelocityConstraintNormalPart, pub tangent_part: VelocityConstraintTangentPart, } -impl VelocityConstraintElement { +impl VelocityConstraintElement { pub fn zero() -> Self { Self { normal_part: VelocityConstraintNormalPart::zero(), @@ -186,7 +184,6 @@ impl VelocityConstraintElement { ) where Vector: WBasis, AngVector: WDot, Result = N>, - N::Element: SimdRealField + Copy, { // Solve penetration. if solve_normal { -- cgit