From 64250f9bb6f5d95f14a8d7f3329d018679710540 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 30 Dec 2016 04:40:06 +0100 Subject: tracker/steamvr: broken, but we already know the right rotation order --- tracker-steamvr/steamvr.hpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tracker-steamvr/steamvr.hpp') diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp index 1adb40b1..4a2bd117 100644 --- a/tracker-steamvr/steamvr.hpp +++ b/tracker-steamvr/steamvr.hpp @@ -18,11 +18,13 @@ using namespace options; -using quat = Mat; - struct settings : opts { - settings() : opts("valve-steamvr") {} + value order; + settings() : + opts("valve-steamvr"), + order(b, "rotation-order", 0) + {} }; class steamvr : public ITracker @@ -41,7 +43,9 @@ private: settings s; - static quat get_quaternion(const vr::HmdMatrix34_t& r); + using rmat = euler::rmat; + using euler_t = euler::euler_t; + static void vr_deleter(); static vr_t vr_init(error_t& error); static QString strerror(error_t error); -- cgit v1.2.3