diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-18 07:31:19 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-18 07:31:19 +0200 |
commit | 3c9106d7777e26326f999f048324c4854f1c16a4 (patch) | |
tree | b0ff6d4c11e5a9dd461361871064502700b666d7 /compat/euler.cpp | |
parent | a40236a21d7dc83be0e9809cfb57a6098a5e6ace (diff) |
compat/{simple-mat,euler}: unbreak calibration
No idea what regressed.
Diffstat (limited to 'compat/euler.cpp')
-rw-r--r-- | compat/euler.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/compat/euler.cpp b/compat/euler.cpp index e48d977b..ab119d3e 100644 --- a/compat/euler.cpp +++ b/compat/euler.cpp @@ -93,43 +93,4 @@ void OTR_COMPAT_EXPORT tait_bryan_to_matrices(const euler_t& input, } } -// from http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/ -Quat matrix_to_quat(const rmat& M) -{ - Quat q(1, 0, 0, 0); - - using std::sqrt; - - double trace = M(0, 0) + M(1, 1) + M(2, 2); // I removed + 1.0; see discussion with Ethan - if( trace > 0 ) {// I changed M_EPSILON to 0 - double s = .5 / std::sqrt(trace + 1); - q.w() = .25 / s; - q.x() = ( M(2, 1) - M(1, 2) ) * s; - q.y() = ( M(0, 2) - M(2, 0) ) * s; - q.z() = ( M(1, 0) - M(0, 1) ) * s; - } else { - if ( M(0, 0) > M(1, 1) && M(0, 0) > M(2, 2) ) { - double s = 2.0 * sqrt( 1.0 + M(0, 0) - M(1, 1) - M(2, 2)); - q.w() = (M(2, 1) - M(1, 2) ) / s; - q.x() = .25 * s; - q.y() = (M(0, 1) + M(1, 0) ) / s; - q.z() = (M(0, 2) + M(2, 0) ) / s; - } else if (M(1, 1) > M(2, 2)) { - double s = 2.0 * sqrt( 1.0 + M(1, 1) - M(0, 0) - M(2, 2)); - q.w() = (M(0, 2) - M(2, 0) ) / s; - q.x() = (M(0, 1) + M(1, 0) ) / s; - q.y() = .25 * s; - q.z() = (M(1, 2) + M(2, 1) ) / s; - } else { - double s = 2.0 * sqrt( 1.0 + M(2, 2) - M(0, 0) - M(1, 1) ); - q.w() = (M(1, 0) - M(0, 1) ) / s; - q.x() = (M(0, 2) + M(2, 0) ) / s; - q.y() = (M(1, 2) + M(2, 1) ) / s; - q.z() = .25 * s; - } - } - - return q; -} - } // end ns euler |