From 6219f9acfa61e54baf266f816b7eaf9ffbd9841e Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Tue, 27 Oct 2009 15:45:24 -0400 Subject: * rename new Quat class to Quaternion, remove existing Quaternion * add Copyright line for Mathieu * cast() was broken (compile errors) and needed anyway to be in QuaternionBase * it's VectorBlock, don't pass additional parameter 1, it has different meaning!! * make it compile with GCC (put 'typename' at the right location) --- Eigen/src/Geometry/arch/Geometry_SSE.h | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'Eigen/src/Geometry/arch') diff --git a/Eigen/src/Geometry/arch/Geometry_SSE.h b/Eigen/src/Geometry/arch/Geometry_SSE.h index c608e4843..1b8f6aead 100644 --- a/Eigen/src/Geometry/arch/Geometry_SSE.h +++ b/Eigen/src/Geometry/arch/Geometry_SSE.h @@ -26,31 +26,12 @@ #ifndef EIGEN_GEOMETRY_SSE_H #define EIGEN_GEOMETRY_SSE_H -template<> inline Quaternion -ei_quaternion_product(const Quaternion& _a, const Quaternion& _b) -{ - const __m128 mask = _mm_castsi128_ps(_mm_setr_epi32(0,0,0,0x80000000)); - Quaternion res; - __m128 a = _a.coeffs().packet(0); - __m128 b = _b.coeffs().packet(0); - __m128 flip1 = _mm_xor_ps(_mm_mul_ps(ei_vec4f_swizzle1(a,1,2,0,2), - ei_vec4f_swizzle1(b,2,0,1,2)),mask); - __m128 flip2 = _mm_xor_ps(_mm_mul_ps(ei_vec4f_swizzle1(a,3,3,3,1), - ei_vec4f_swizzle1(b,0,1,2,1)),mask); - ei_pstore(&res.x(), - _mm_add_ps(_mm_sub_ps(_mm_mul_ps(a,ei_vec4f_swizzle1(b,3,3,3,3)), - _mm_mul_ps(ei_vec4f_swizzle1(a,2,0,1,0), - ei_vec4f_swizzle1(b,1,2,0,0))), - _mm_add_ps(flip1,flip2))); - return res; -} - template struct ei_quat_product { - inline static Quat run(const QuaternionBase& _a, const QuaternionBase& _b) + inline static Quaternion run(const QuaternionBase& _a, const QuaternionBase& _b) { const __m128 mask = _mm_castsi128_ps(_mm_setr_epi32(0,0,0,0x80000000)); - Quat res; + Quaternion res; __m128 a = _a.coeffs().packet(0); __m128 b = _b.coeffs().packet(0); __m128 flip1 = _mm_xor_ps(_mm_mul_ps(ei_vec4f_swizzle1(a,1,2,0,2), -- cgit v1.2.3