summaryrefslogtreecommitdiffhomepage
path: root/opentrack
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-03-07 20:16:05 +0100
committerStanislaw Halik <sthalik@misaki.pl>2016-03-07 20:16:05 +0100
commit57ab688b4f422a0165795f69182caf4d2430a549 (patch)
treeb0cf1f8ad696ec755dd4ba67a618e47a48f5f296 /opentrack
parent2138103b7c3af54e9cecd081403e8f536db6de1e (diff)
remove unused center_method setting
Diffstat (limited to 'opentrack')
-rwxr-xr-x[-rw-r--r--]opentrack/main-settings.hpp2
-rwxr-xr-x[-rw-r--r--]opentrack/tracker.cpp10
2 files changed, 1 insertions, 11 deletions
diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp
index 2d1c1f22..03973802 100644..100755
--- a/opentrack/main-settings.hpp
+++ b/opentrack/main-settings.hpp
@@ -48,7 +48,6 @@ struct main_settings : opts {
value<bool> tray_enabled;
value<int> camera_yaw, camera_pitch, camera_roll;
value<bool> center_at_startup, wizard_done;
- value<int> center_method;
key_opts key_start_tracking, key_stop_tracking, key_toggle_tracking;
key_opts key_center, key_toggle, key_zero;
main_settings() :
@@ -68,7 +67,6 @@ struct main_settings : opts {
camera_roll(b, "camera-roll", 0),
center_at_startup(b, "center-at-startup", true),
wizard_done(b, "wizard-done", false),
- center_method(b, "centering-method", true),
key_start_tracking(b, "start-tracking"),
key_stop_tracking(b, "stop-tracking"),
key_toggle_tracking(b, "toggle-tracking"),
diff --git a/opentrack/tracker.cpp b/opentrack/tracker.cpp
index 1bc28b87..d8562f52 100644..100755
--- a/opentrack/tracker.cpp
+++ b/opentrack/tracker.cpp
@@ -169,15 +169,7 @@ void Tracker::logic()
double tmp[3] = { t(0) - t_b[0], t(1) - t_b[1], t(2) - t_b[2] };
t_compensate(cam, tmp, tmp, false);
rmat m_;
- switch (1)
- {
- case 0:
- default:
- m_ = r * r_b.t();
- break;
- case 1:
- m_ = r_b.t() * r;
- }
+ m_ = r_b.t() * r;
const dmat<3, 1> euler = rmat::rmat_to_euler(m_);
for (int i = 0; i < 3; i++)