From fff539163e23c687ef32d61aa91c16b2e616ec63 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 17 Sep 2014 07:55:35 +0200 Subject: remove win32-joystick axis remap Feature provided for all trackers in core. Only confuses when both remaps used at the same time. Issue: #52 --- .../ftnoir_tracker_joystick.cpp | 21 +- ftnoir_tracker_joystick/ftnoir_tracker_joystick.h | 12 - .../ftnoir_tracker_joystick_controls.ui | 394 +-------------------- .../ftnoir_tracker_joystick_dialog.cpp | 7 - 4 files changed, 16 insertions(+), 418 deletions(-) (limited to 'ftnoir_tracker_joystick') diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp index e1d92b78..0e95f57d 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp @@ -196,26 +196,9 @@ void FTNoIR_Tracker::GetHeadPoseData(double *data) 90, 180 }; - - int axes[] = { - s.axis_0, - s.axis_1, - s.axis_2, - s.axis_3, - s.axis_4, - s.axis_5 - }; - + for (int i = 0; i < 6; i++) - { - auto idx = axes[i] - 1; - if (idx < 0 || idx > 7) - { - data[i] = 0; - } - else - data[i] = values[i] * limits[i] / AXIS_MAX; - } + data[i] = values[i] * limits[i] / AXIS_MAX; } extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor() diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h index 1135b609..75ea9f52 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h @@ -32,21 +32,9 @@ using namespace options; struct settings { pbundle b; - value axis_0; - value axis_1; - value axis_2; - value axis_3; - value axis_4; - value axis_5; value joyid; settings() : b(bundle("tracker-joystick")), - axis_0(b, "axis-0", 0), - axis_1(b, "axis-1", 0), - axis_2(b, "axis-2", 0), - axis_3(b, "axis-3", 0), - axis_4(b, "axis-4", 0), - axis_5(b, "axis-5", 0), joyid(b, "joy-id", "") {} }; diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui index 5d349169..b0e010a1 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui @@ -9,8 +9,8 @@ 0 0 - 216 - 259 + 326 + 88 @@ -32,385 +32,25 @@ false - - - + + + + + Joystick + + + + + - + 0 0 - - - 0 - 85 - - - - Axis enablement - - - Qt::AlignCenter - - - - - - X - - - - - - - Y - - - - - - - Roll - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - Yaw - - - - - - - - - - - - - #1 - - - - - #2 - - - - - #3 - - - - - #4 - - - - - #5 - - - - - #6 - - - - - #7 - - - - - #8 - - - - - - - - Z - - - - - - - Pitch - - - - - - - Joy Id - - - - - - - - 0 - 0 - - - - - - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -421,12 +61,6 @@ joylist - comboBox - comboBox_2 - comboBox_3 - comboBox_4 - comboBox_5 - comboBox_6 buttonBox diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp index 7f24a8f1..eea7f916 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp @@ -19,13 +19,6 @@ TrackerControls::TrackerControls() : tracker(nullptr) connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); - tie_setting(s.axis_0, ui.comboBox); - tie_setting(s.axis_1, ui.comboBox_2); - tie_setting(s.axis_2, ui.comboBox_3); - tie_setting(s.axis_3, ui.comboBox_4); - tie_setting(s.axis_4, ui.comboBox_5); - tie_setting(s.axis_5, ui.comboBox_6); - { auto hr = CoInitialize( nullptr ); LPDIRECTINPUT8 g_pDI = nullptr; -- cgit v1.2.3