diff options
| -rwxr-xr-x[-rw-r--r--] | gui/options-dialog.cpp | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | gui/settings.ui | 90 | ||||
| -rwxr-xr-x[-rw-r--r--] | opentrack/main-settings.hpp | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | opentrack/tracker.cpp | 10 |
4 files changed, 26 insertions, 78 deletions
diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp index 1e734135..d57b9f35 100644..100755 --- a/gui/options-dialog.cpp +++ b/gui/options-dialog.cpp @@ -111,8 +111,6 @@ OptionsDialog::OptionsDialog(main_settings& main, tie_setting(main.camera_pitch, ui.camera_pitch); tie_setting(main.camera_roll, ui.camera_roll); - tie_setting(main.center_method, ui.center_method); - connect(ui.bind_center, &QPushButton::pressed, [&]() -> void { bind_key(main.key_center, ui.center_text); }); connect(ui.bind_zero, &QPushButton::pressed, [&]() -> void { bind_key(main.key_zero, ui.zero_text); }); connect(ui.bind_toggle, &QPushButton::pressed, [&]() -> void { bind_key(main.key_toggle, ui.toggle_text); }); diff --git a/gui/settings.ui b/gui/settings.ui index b00e0960..59c98e96 100644..100755 --- a/gui/settings.ui +++ b/gui/settings.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>428</width> - <height>525</height> + <width>441</width> + <height>552</height> </rect> </property> <property name="windowTitle"> @@ -34,33 +34,6 @@ <string>Shortcuts</string> </attribute> <layout class="QGridLayout" name="gridLayout_9"> - <item row="2" column="0"> - <widget class="QCheckBox" name="center_at_startup"> - <property name="text"> - <string>Center at startup</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="trayp"> - <property name="text"> - <string>Minimize to tray</string> - </property> - </widget> - </item> <item row="0" column="0"> <widget class="QGroupBox" name="groupBox_8"> <property name="title"> @@ -240,43 +213,30 @@ </widget> </item> <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox_9111"> - <property name="title"> - <string>Centering method</string> + <widget class="QCheckBox" name="center_at_startup"> + <property name="text"> + <string>Center at startup</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="trayp"> + <property name="text"> + <string>Minimize to tray</string> </property> - <layout class="QGridLayout" name="gridLayout111"> - <item row="1" column="0"> - <widget class="QLabel" name="label_26"> - <property name="text"> - <string>Method</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="center_method"> - <item> - <property name="text"> - <string>Relative (inertial device)</string> - </property> - </item> - <item> - <property name="text"> - <string>Absolute (camera device)</string> - </property> - </item> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="label_25"> - <property name="text"> - <string>Try changing this if centering doesn't perform correctly for your input device.</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> </widget> </item> </layout> 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++) |