summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-04-27 20:25:17 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-04-27 20:26:18 +0200
commitc881d7ff07371838d39a08cc0194dc62d9e6bbea (patch)
treee10cc4489336dbed69b357464d930242932643a3
parent837b86dff99c8bee9300d203b7d442c9af599c8b (diff)
tracker/steamvr: issue #771
-rw-r--r--tracker-steamvr/steamvr.hpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp
index fb7cd4c5..4ae52371 100644
--- a/tracker-steamvr/steamvr.hpp
+++ b/tracker-steamvr/steamvr.hpp
@@ -17,6 +17,10 @@
#include <QList>
using namespace options;
+
+using rmat = euler::rmat;
+using euler_t = euler::euler_t;
+
using error_t = vr::EVRInitError;
using vr_t = vr::IVRSystem*;
@@ -69,8 +73,10 @@ class steamvr : public QObject, public ITracker
{
Q_OBJECT
- using error_t = vr::EVRInitError;
- using vr_t = vr::IVRSystem*;
+ static void matrix_to_euler(double& yaw, double& pitch, double& roll, const vr::HmdMatrix34_t& result);
+
+ settings s;
+ int device_index;
public:
steamvr();
@@ -78,15 +84,6 @@ public:
module_status start_tracker(QFrame *) override;
void data(double *data) override;
bool center() override;
-
-private:
- static void matrix_to_euler(double& yaw, double& pitch, double& roll, const vr::HmdMatrix34_t& result);
-
- settings s;
- int device_index;
-
- using rmat = euler::rmat;
- using euler_t = euler::euler_t;
};
class steamvr_dialog : public ITrackerDialog