summaryrefslogtreecommitdiffhomepage
path: root/tracker-rift-025
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-10-01 16:49:34 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-10-01 16:49:34 +0200
commitb5e67864360d98145c67130bfdb3c4c56963c787 (patch)
treebca80d2b41eacf30205ef91ee09d043dba063ca3 /tracker-rift-025
parent29406db336d00a223fec9035044a5ca46ade1d3f (diff)
tracker/rift-{025,042,080}: fix gimbal lockopentrack-2.3-rc99p13
It was tested only on 080 but the API is almost the same on 042 and 025. Issue: #464 Reported-by: @Jerrow
Diffstat (limited to 'tracker-rift-025')
-rw-r--r--tracker-rift-025/ftnoir_tracker_rift_025.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
index dcb97fc5..e0ea2ad7 100644
--- a/tracker-rift-025/ftnoir_tracker_rift_025.cpp
+++ b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
@@ -66,11 +66,19 @@ void Rift_Tracker::data(double *data)
{
if (pSFusion != NULL && pSensor != NULL)
{
- Quatf hmdOrient = pSFusion->GetOrientation();
+ Quatf rot = pSFusion->GetOrientation();
- float yaw = 0, pitch = 0, roll = 0;
+ static constexpr float c_mult = 8;
+ static constexpr float c_div = 1/c_mult;
- hmdOrient.GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(&yaw, &pitch , &roll);
+ Vector3f axis;
+ float angle;
+
+ rot.GetAxisAngle(&axis, &angle);
+ angle *= c_div;
+
+ float yaw, pitch, roll;
+ Quatf(axis, angle).GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(&yaw, &pitch, &roll);
double yaw_ = double(yaw);