summaryrefslogtreecommitdiffhomepage
path: root/tracker-rift-025/ftnoir_tracker_rift_025.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-06-09 11:09:23 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-06-09 11:09:23 +0200
commit3a1458031b50fce43419a8b80924cc9439248c73 (patch)
treea98b4b333e8996b2aa659eaddd6e395f44f66990 /tracker-rift-025/ftnoir_tracker_rift_025.cpp
parent5adefe58a9f927bb3fddb4ee7706492f7a6ec43e (diff)
tracker/rift-{025,042,080}: fix float/double promotions
The change was only read and compile-tested.
Diffstat (limited to 'tracker-rift-025/ftnoir_tracker_rift_025.cpp')
-rw-r--r--tracker-rift-025/ftnoir_tracker_rift_025.cpp38
1 files changed, 22 insertions, 16 deletions
diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
index 4b938763..aab8d530 100644
--- a/tracker-rift-025/ftnoir_tracker_rift_025.cpp
+++ b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
@@ -3,6 +3,11 @@
#include "opentrack/plugin-api.hpp"
#include "OVR.h"
#include <cstdio>
+#include <cmath>
+
+#ifndef M_PI
+# define M_PI 3.14159265358979323846
+#endif
using namespace OVR;
@@ -65,27 +70,28 @@ void Rift_Tracker::data(double *data)
if (pSFusion != NULL && pSensor != NULL)
{
Quatf hmdOrient = pSFusion->GetOrientation();
- double newHeadPose[6];
- float yaw = 0;
- float pitch = 0;
- float roll = 0;
+ float yaw = 0, pitch = 0, roll = 0;
+
hmdOrient.GetEulerAngles<Axis_Y, Axis_X, Axis_Z>(&yaw, &pitch , &roll);
- newHeadPose[Pitch] = pitch;
- newHeadPose[Roll] = roll;
- newHeadPose[Yaw] = yaw;
+
+ double yaw_ = yaw;
+
if (s.useYawSpring)
{
- newHeadPose[Yaw] = old_yaw*s.persistence + (yaw-old_yaw);
- if(newHeadPose[Yaw] > s.deadzone)
- newHeadPose[Yaw] -= s.constant_drift;
- if(newHeadPose[Yaw] < -s.deadzone)
- newHeadPose[Yaw] += s.constant_drift;
- old_yaw=yaw;
+ yaw_ = old_yaw*s.persistence + (yaw_-old_yaw);
+ if (yaw_ > s.deadzone)
+ yaw_ -= s.constant_drift;
+ if (yaw_ < -s.deadzone)
+ yaw_ += s.constant_drift;
+ old_yaw = yaw_;
}
- data[Yaw] = newHeadPose[Yaw] * 57.295781f;
- data[Pitch] = newHeadPose[Pitch] * 57.295781f;
- data[Roll] = newHeadPose[Roll] * 57.295781f;
+
+ static constexpr double r2d = 180 / M_PI;
+
+ data[Yaw] = yaw_ * r2d;
+ data[Pitch] = double(pitch) * r2d;
+ data[Roll] = double(roll) * r2d;
}
}