summaryrefslogtreecommitdiffhomepage
path: root/opentrack
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-06-11 09:28:30 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-06-11 09:28:30 +0200
commit18f375918765baf7427a54c27863cf5e0fa19d5f (patch)
treef9d71c2dbc991cc63c32b3881d716cc4abd240f8 /opentrack
parent5a8f96d3758ef717231e756c432e0d1ee30aebad (diff)
api/tracker: treat all camera shift values as equal to raw data
Input the exact "raw data" values into settings -> camera -> offset. THIS IS A BREAKING CHANGE. User configs are affected. It was previously suggested to make the signs sensible but I don't remember by whom.
Diffstat (limited to 'opentrack')
-rw-r--r--opentrack/tracker.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/opentrack/tracker.cpp b/opentrack/tracker.cpp
index d7070eb4..cdee2800 100644
--- a/opentrack/tracker.cpp
+++ b/opentrack/tracker.cpp
@@ -132,10 +132,11 @@ void Tracker::logic()
if (is_nan(raw))
raw = last_raw;
- const double off[] = {
+ const double off[] =
+ {
(double)-s.camera_yaw,
(double)-s.camera_pitch,
- (double)s.camera_roll
+ (double)-s.camera_roll
};
const rmat cam = rmat::euler_to_rmat(off);
rmat r = rmat::euler_to_rmat(&value[Yaw]);
@@ -256,7 +257,7 @@ void Tracker::run() {
double tmp[6] {0,0,0, 0,0,0};
libs.pTracker->data(tmp);
-
+
if (enabledp)
for (int i = 0; i < 6; i++)
newpose[i] = elide_nan(tmp[i], newpose[i]);