From 57ab688b4f422a0165795f69182caf4d2430a549 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 7 Mar 2016 20:16:05 +0100 Subject: remove unused center_method setting --- opentrack/main-settings.hpp | 2 -- opentrack/tracker.cpp | 10 +--------- 2 files changed, 1 insertion(+), 11 deletions(-) mode change 100644 => 100755 opentrack/main-settings.hpp mode change 100644 => 100755 opentrack/tracker.cpp (limited to 'opentrack') diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp old mode 100644 new mode 100755 index 2d1c1f22..03973802 --- a/opentrack/main-settings.hpp +++ b/opentrack/main-settings.hpp @@ -48,7 +48,6 @@ struct main_settings : opts { value tray_enabled; value camera_yaw, camera_pitch, camera_roll; value center_at_startup, wizard_done; - value 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 old mode 100644 new mode 100755 index 1bc28b87..d8562f52 --- 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++) -- cgit v1.2.3