diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-18 06:10:28 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-18 06:34:57 +0200 |
| commit | 95b9f8495735bc83e06fa4a17bd54fc553a48d10 (patch) | |
| tree | 293801f64476daa70ccbfb94aa8dbd863c66d59c /gui | |
| parent | cb732ec4142d1b36c10af211ac6d8da4ddb00d45 (diff) | |
logic/tracker: fix option not used in logic
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/main-window.cpp | 2 | ||||
| -rw-r--r-- | gui/options-dialog.cpp | 1 | ||||
| -rw-r--r-- | gui/options-dialog.ui | 10 |
3 files changed, 2 insertions, 11 deletions
diff --git a/gui/main-window.cpp b/gui/main-window.cpp index 1fdfcb53..d64858c4 100644 --- a/gui/main-window.cpp +++ b/gui/main-window.cpp @@ -555,7 +555,7 @@ void MainWindow::showHeadPose() { double mapped[6], raw[6]; - work->tracker->get_raw_and_mapped_poses(mapped, raw); + work->tracker->raw_and_mapped_pose(mapped, raw); display_pose(mapped, raw); } diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp index 51da498a..4c66eeb2 100644 --- a/gui/options-dialog.cpp +++ b/gui/options-dialog.cpp @@ -86,7 +86,6 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) : tie_setting(main.camera_yaw, ui.camera_yaw); tie_setting(main.camera_pitch, ui.camera_pitch); tie_setting(main.camera_roll, ui.camera_roll); - tie_setting(main.use_camera_offset_from_centering, ui.use_center_as_translation_camera_offset); tie_setting(main.center_method, ui.center_method); diff --git a/gui/options-dialog.ui b/gui/options-dialog.ui index f6c04893..0a6e5839 100644 --- a/gui/options-dialog.ui +++ b/gui/options-dialog.ui @@ -987,13 +987,6 @@ </property> <layout class="QGridLayout" name="gridLayout_6"> <item row="4" column="0"> - <widget class="QCheckBox" name="use_center_as_translation_camera_offset"> - <property name="text"> - <string>Use camera center as translation offset</string> - </property> - </widget> - </item> - <item row="5" column="0"> <widget class="QLabel" name="label_17"> <property name="minimumSize"> <size> @@ -1018,7 +1011,7 @@ </property> </widget> </item> - <item row="6" column="0" alignment="Qt::AlignLeft"> + <item row="5" column="0" alignment="Qt::AlignLeft"> <widget class="QGroupBox" name="groupBox_3"> <property name="styleSheet"> <string notr="true">QGroupBox @@ -2506,7 +2499,6 @@ <tabstop>bind_restart_tracking</tabstop> <tabstop>trayp</tabstop> <tabstop>tray_start</tabstop> - <tabstop>use_center_as_translation_camera_offset</tabstop> <tabstop>camera_yaw</tabstop> <tabstop>camera_pitch</tabstop> <tabstop>camera_roll</tabstop> |