From ee7530c39aaa769b7baea5fb4ece27786e04d521 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 4 Jul 2016 10:36:00 +0200 Subject: logic/tracker, api/simple-mat: don't convert rad <-> deg all the time --- opentrack/simple-mat.cpp | 6 +++--- opentrack/simple-mat.hpp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'opentrack') diff --git a/opentrack/simple-mat.cpp b/opentrack/simple-mat.cpp index 4ab68e0f..367cf365 100644 --- a/opentrack/simple-mat.cpp +++ b/opentrack/simple-mat.cpp @@ -36,9 +36,9 @@ euler_t rmat_to_euler(const dmat<3, 3>& R) // tait-bryan angles, not euler rmat euler_to_rmat(const double* input) { - auto H = input[0] * pi / 180; - auto P = input[1] * pi / 180; - auto B = input[2] * pi / 180; + const double H = input[0]; + const double P = input[1]; + const double B = input[2]; const auto c1 = cos(H); const auto s1 = sin(H); diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp index f5680ec4..8dc03014 100644 --- a/opentrack/simple-mat.hpp +++ b/opentrack/simple-mat.hpp @@ -253,3 +253,9 @@ euler_t OPENTRACK_API_EXPORT rmat_to_euler(const dmat<3, 3>& R); } // end ns euler template using dmat = Mat; + +template +inline Mat operator*(num scalar, const Mat& mat) +{ + return mat * scalar; +} -- cgit v1.2.3