diff options
158 files changed, 230 insertions, 221 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ad863b..948bfe04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,10 @@ file(GLOB opentrack-subprojects "tracker-*/${C}" "proto-*/${C}" "filter-*/${C}" - "opentrack*/${C}" + "api/${C}" + "compat/${C}" + "logic/${C}" + "dinput/${C}" "gui/${C}" "x-plane-plugin/${C}" "csv/${C}" diff --git a/opentrack/CMakeLists.txt b/api/CMakeLists.txt index 5151cbf7..5151cbf7 100644 --- a/opentrack/CMakeLists.txt +++ b/api/CMakeLists.txt diff --git a/opentrack/dtors.cpp b/api/dtors.cpp index 5cc87187..5cc87187 100644 --- a/opentrack/dtors.cpp +++ b/api/dtors.cpp diff --git a/opentrack/export.hpp b/api/export.hpp index a9f3521e..a9f3521e 100644 --- a/opentrack/export.hpp +++ b/api/export.hpp diff --git a/opentrack/is-window-visible.cpp b/api/is-window-visible.cpp index fc25bb7d..fc25bb7d 100644 --- a/opentrack/is-window-visible.cpp +++ b/api/is-window-visible.cpp diff --git a/opentrack/is-window-visible.hpp b/api/is-window-visible.hpp index 18c9251a..18c9251a 100644 --- a/opentrack/is-window-visible.hpp +++ b/api/is-window-visible.hpp diff --git a/opentrack/plugin-api.hpp b/api/plugin-api.hpp index 1e5c0fe0..1e5c0fe0 100644 --- a/opentrack/plugin-api.hpp +++ b/api/plugin-api.hpp diff --git a/opentrack/plugin-support.hpp b/api/plugin-support.hpp index a26d7f08..072c8da7 100644 --- a/opentrack/plugin-support.hpp +++ b/api/plugin-support.hpp @@ -8,7 +8,7 @@ #pragma once #include "plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" #include <QWidget> #include <QDebug> diff --git a/opentrack/variance.hpp b/api/variance.hpp index 55060b02..55060b02 100644 --- a/opentrack/variance.hpp +++ b/api/variance.hpp diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index ecf4cff3..860259ca 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -10,7 +10,7 @@ unset(c) unset(e) # specify the cross compiler if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(p P:/mingw-w64/i686-5.3.0-posix-dwarf-rt_v4-rev0/mingw32/bin/) + set(p P:/mingw-w64/i686-6.1.0-posix-dwarf-rt_v5-rev0/mingw32/bin/) set(e .exe) endif() set(c ${p}i686-w64-mingw32-) diff --git a/cmake/opentrack-version.cmake b/cmake/opentrack-version.cmake index 5a4901ef..bb907525 100644 --- a/cmake/opentrack-version.cmake +++ b/cmake/opentrack-version.cmake @@ -19,7 +19,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/opentrack-version.h "#define OPENTRACK_VERSION \" set(version-string " #define BUILD_compat -#include \"opentrack-compat/export.hpp\" +#include \"compat/export.hpp\" #ifdef __cplusplus extern \"C\" diff --git a/opentrack-compat/CMakeLists.txt b/compat/CMakeLists.txt index 2bbb496c..2bbb496c 100644 --- a/opentrack-compat/CMakeLists.txt +++ b/compat/CMakeLists.txt diff --git a/opentrack-compat/camera-names.cpp b/compat/camera-names.cpp index 21ff3b52..21ff3b52 100644 --- a/opentrack-compat/camera-names.cpp +++ b/compat/camera-names.cpp diff --git a/opentrack-compat/camera-names.hpp b/compat/camera-names.hpp index ae0c6b25..ae0c6b25 100644 --- a/opentrack-compat/camera-names.hpp +++ b/compat/camera-names.hpp diff --git a/opentrack-compat/export.hpp b/compat/export.hpp index ba10f131..ba10f131 100644 --- a/opentrack-compat/export.hpp +++ b/compat/export.hpp diff --git a/opentrack-compat/make-unique.hpp b/compat/make-unique.hpp index bb5315c5..bb5315c5 100644 --- a/opentrack-compat/make-unique.hpp +++ b/compat/make-unique.hpp diff --git a/opentrack-compat/nan.cpp b/compat/nan.cpp index 899b907a..899b907a 100644 --- a/opentrack-compat/nan.cpp +++ b/compat/nan.cpp diff --git a/opentrack-compat/nan.hpp b/compat/nan.hpp index 9926da13..9926da13 100644 --- a/opentrack-compat/nan.hpp +++ b/compat/nan.hpp diff --git a/opentrack-compat/options.cpp b/compat/options.cpp index 8c6e6c65..8c6e6c65 100644 --- a/opentrack-compat/options.cpp +++ b/compat/options.cpp diff --git a/opentrack-compat/options.hpp b/compat/options.hpp index 40aca2de..40aca2de 100644 --- a/opentrack-compat/options.hpp +++ b/compat/options.hpp diff --git a/opentrack-compat/pi-constant.hpp b/compat/pi-constant.hpp index 52b98a7f..52b98a7f 100644 --- a/opentrack-compat/pi-constant.hpp +++ b/compat/pi-constant.hpp diff --git a/opentrack-compat/process-list.hpp b/compat/process-list.hpp index 10613791..10613791 100644 --- a/opentrack-compat/process-list.hpp +++ b/compat/process-list.hpp diff --git a/opentrack-compat/qcopyable-mutex.hpp b/compat/qcopyable-mutex.hpp index 57b0030d..57b0030d 100644 --- a/opentrack-compat/qcopyable-mutex.hpp +++ b/compat/qcopyable-mutex.hpp diff --git a/opentrack-compat/shm.cpp b/compat/shm.cpp index 83a3260c..83a3260c 100644 --- a/opentrack-compat/shm.cpp +++ b/compat/shm.cpp diff --git a/opentrack-compat/shm.h b/compat/shm.h index f212dc17..f212dc17 100644 --- a/opentrack-compat/shm.h +++ b/compat/shm.h diff --git a/opentrack-compat/sleep.hpp b/compat/sleep.hpp index fab27286..fab27286 100644 --- a/opentrack-compat/sleep.hpp +++ b/compat/sleep.hpp diff --git a/opentrack-compat/slider.cpp b/compat/slider.cpp index be1aaeb8..be1aaeb8 100644 --- a/opentrack-compat/slider.cpp +++ b/compat/slider.cpp diff --git a/opentrack-compat/slider.hpp b/compat/slider.hpp index 7d54c650..7d54c650 100644 --- a/opentrack-compat/slider.hpp +++ b/compat/slider.hpp diff --git a/opentrack-compat/timer.hpp b/compat/timer.hpp index 300a883c..300a883c 100644 --- a/opentrack-compat/timer.hpp +++ b/compat/timer.hpp diff --git a/opentrack-compat/util.hpp b/compat/util.hpp index 1217e654..1217e654 100644 --- a/opentrack-compat/util.hpp +++ b/compat/util.hpp diff --git a/opentrack-compat/win32-com.cpp b/compat/win32-com.cpp index dd7c24a8..dd7c24a8 100644 --- a/opentrack-compat/win32-com.cpp +++ b/compat/win32-com.cpp diff --git a/opentrack-compat/win32-com.hpp b/compat/win32-com.hpp index dcbea089..dcbea089 100644 --- a/opentrack-compat/win32-com.hpp +++ b/compat/win32-com.hpp diff --git a/cv/camera-dialog.hpp b/cv/camera-dialog.hpp index 3fd853c3..c5896ca3 100644 --- a/cv/camera-dialog.hpp +++ b/cv/camera-dialog.hpp @@ -8,9 +8,9 @@ #pragma once -#include "opentrack-compat/camera-names.hpp" -#include "opentrack-compat/sleep.hpp" -#include "opentrack-compat/win32-com.hpp" +#include "compat/camera-names.hpp" +#include "compat/sleep.hpp" +#include "compat/win32-com.hpp" #ifdef __linux # include <QProcess> diff --git a/cv/camera-dialog.hpp.OO4364 b/cv/camera-dialog.hpp.OO4364 index e99b5f6e..6f4c7966 100644 --- a/cv/camera-dialog.hpp.OO4364 +++ b/cv/camera-dialog.hpp.OO4364 @@ -9,8 +9,8 @@ #pragma once #include "export.hpp" -#include "opentrack-compat/camera-names.hpp" -#include "opentrack-compat/sleep.hpp" +#include "compat/camera-names.hpp" +#include "compat/sleep.hpp" #ifdef __linux # include <QProcess> diff --git a/cv/video-widget.cpp b/cv/video-widget.cpp index b514dc8f..bc143378 100644 --- a/cv/video-widget.cpp +++ b/cv/video-widget.cpp @@ -9,7 +9,7 @@ #include "video-widget.hpp" #include <opencv2/imgproc.hpp> -#include "opentrack/is-window-visible.hpp" +#include "api/is-window-visible.hpp" cv_video_widget::cv_video_widget(QWidget* parent) : QWidget(parent), diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp index 2d5d673f..46332afe 100644 --- a/cv/video-widget.hpp +++ b/cv/video-widget.hpp @@ -8,7 +8,7 @@ #pragma once -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include <opencv2/core/core.hpp> #include <memory> #include <QObject> diff --git a/opentrack-dinput/CMakeLists.txt b/dinput/CMakeLists.txt index ed0b5990..ed0b5990 100644 --- a/opentrack-dinput/CMakeLists.txt +++ b/dinput/CMakeLists.txt diff --git a/opentrack-dinput/dinput.cpp b/dinput/dinput.cpp index ae132e70..d408ff2f 100644 --- a/opentrack-dinput/dinput.cpp +++ b/dinput/dinput.cpp @@ -1,7 +1,7 @@ #ifdef _WIN32 #include "dinput.hpp" -#include "opentrack-compat/win32-com.hpp" +#include "compat/win32-com.hpp" #include <QDebug> std::atomic<int> dinput_handle::refcnt; diff --git a/opentrack-dinput/dinput.hpp b/dinput/dinput.hpp index 53f1c4af..53f1c4af 100644 --- a/opentrack-dinput/dinput.hpp +++ b/dinput/dinput.hpp diff --git a/opentrack-dinput/export.hpp b/dinput/export.hpp index 51ee4531..51ee4531 100644 --- a/opentrack-dinput/export.hpp +++ b/dinput/export.hpp diff --git a/opentrack-dinput/keybinding-worker.cpp b/dinput/keybinding-worker.cpp index 32bfc6f0..32bfc6f0 100644 --- a/opentrack-dinput/keybinding-worker.cpp +++ b/dinput/keybinding-worker.cpp diff --git a/opentrack-dinput/keybinding-worker.hpp b/dinput/keybinding-worker.hpp index 623875ac..39b850e0 100644 --- a/opentrack-dinput/keybinding-worker.hpp +++ b/dinput/keybinding-worker.hpp @@ -10,7 +10,7 @@ #include "export.hpp" -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include "win32-joystick.hpp" #include "dinput.hpp" #include <QThread> diff --git a/opentrack-dinput/win32-joystick.cpp b/dinput/win32-joystick.cpp index 18500a0d..9502bcd2 100644 --- a/opentrack-dinput/win32-joystick.cpp +++ b/dinput/win32-joystick.cpp @@ -2,7 +2,7 @@ #undef NDEBUG #include "win32-joystick.hpp" -#include "opentrack-compat/sleep.hpp" +#include "compat/sleep.hpp" #include <cassert> #include <cstring> #include <algorithm> diff --git a/opentrack-dinput/win32-joystick.hpp b/dinput/win32-joystick.hpp index ef8f59b0..4b48d4a1 100644 --- a/opentrack-dinput/win32-joystick.hpp +++ b/dinput/win32-joystick.hpp @@ -10,7 +10,7 @@ #ifdef _WIN32 #include "dinput.hpp" -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include "export.hpp" #include <cstring> #include <memory> diff --git a/filter-accela/ftnoir_filter_accela.cpp b/filter-accela/ftnoir_filter_accela.cpp index f05b8f41..526b2da6 100644 --- a/filter-accela/ftnoir_filter_accela.cpp +++ b/filter-accela/ftnoir_filter_accela.cpp @@ -9,7 +9,7 @@ #include <cmath> #include <QDebug> #include <QMutexLocker> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" static constexpr double rot_gains[][2] = { { 6, 200 }, diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h index eb1a30a4..828b78a0 100644 --- a/filter-accela/ftnoir_filter_accela.h +++ b/filter-accela/ftnoir_filter_accela.h @@ -6,15 +6,15 @@ */ #pragma once #include "ui_ftnoir_accela_filtercontrols.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "spline-widget/spline.hpp" #include <atomic> #include <QMutex> #include <QTimer> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" struct settings_accela : opts { diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp index 7d257711..83114b20 100644 --- a/filter-accela/ftnoir_filter_accela_dialog.cpp +++ b/filter-accela/ftnoir_filter_accela_dialog.cpp @@ -9,7 +9,7 @@ #include <QDebug> #include <algorithm> #include <QDoubleSpinBox> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "spline-widget/spline-widget.hpp" #include <QDialog> diff --git a/filter-ewma2/ftnoir_filter_ewma2.cpp b/filter-ewma2/ftnoir_filter_ewma2.cpp index 7229c6d6..beceb4c2 100644 --- a/filter-ewma2/ftnoir_filter_ewma2.cpp +++ b/filter-ewma2/ftnoir_filter_ewma2.cpp @@ -8,7 +8,7 @@ #include <cmath> #include <QDebug> #include <QWidget> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <algorithm> #include <QMutexLocker> diff --git a/filter-ewma2/ftnoir_filter_ewma2.h b/filter-ewma2/ftnoir_filter_ewma2.h index 589b7910..e7fdd49e 100644 --- a/filter-ewma2/ftnoir_filter_ewma2.h +++ b/filter-ewma2/ftnoir_filter_ewma2.h @@ -1,11 +1,11 @@ #pragma once -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_ewma_filtercontrols.h" #include <QWidget> #include <QMutex> -#include "opentrack-compat/options.hpp" -#include "opentrack-compat/timer.hpp" +#include "compat/options.hpp" +#include "compat/timer.hpp" using namespace options; struct settings : opts { diff --git a/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp b/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp index 8e69573e..79fcd959 100644 --- a/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp +++ b/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp @@ -2,7 +2,7 @@ #include <cmath> #include <QDebug> #include <QString> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_ewma_filtercontrols.h" FilterControls::FilterControls() diff --git a/filter-kalman/kalman.h b/filter-kalman/kalman.h index aaed3bc1..d28557c6 100644 --- a/filter-kalman/kalman.h +++ b/filter-kalman/kalman.h @@ -7,10 +7,10 @@ */ #include "ui_ftnoir_kalman_filtercontrols.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include <Eigen/Core> #include <Eigen/LU> diff --git a/gui/keyboard.h b/gui/keyboard.h index 27300690..d35fe675 100644 --- a/gui/keyboard.h +++ b/gui/keyboard.h @@ -1,8 +1,8 @@ #pragma once #include "ui_keyboard_listener.h" #ifdef _WIN32 -#include "opentrack-logic/win32-shortcuts.h" -#include "opentrack-dinput/keybinding-worker.hpp" +#include "logic/win32-shortcuts.h" +#include "dinput/keybinding-worker.hpp" #endif #include <QLabel> #include <QKeyEvent> diff --git a/gui/main-window.cpp b/gui/main-window.cpp index 667c3032..70652201 100644 --- a/gui/main-window.cpp +++ b/gui/main-window.cpp @@ -7,8 +7,8 @@ */ #include "main-window.hpp" -#include "opentrack-logic/tracker.h" -#include "opentrack-compat/options.hpp" +#include "logic/tracker.h" +#include "compat/options.hpp" #include "opentrack-library-path.h" #include "new_file_dialog.h" #include <QFile> diff --git a/gui/main-window.hpp b/gui/main-window.hpp index b068d158..e05ee9cc 100644 --- a/gui/main-window.hpp +++ b/gui/main-window.hpp @@ -8,16 +8,16 @@ #pragma once -#include "opentrack/plugin-support.hpp" +#include "api/plugin-support.hpp" #include "mapping-window.hpp" #include "options-dialog.hpp" #include "process_detector.h" -#include "opentrack-logic/main-settings.hpp" -#include "opentrack-logic/tracker.h" -#include "opentrack-logic/shortcuts.h" -#include "opentrack-logic/work.hpp" -#include "opentrack-logic/state.hpp" -#include "opentrack-compat/options.hpp" +#include "logic/main-settings.hpp" +#include "logic/tracker.h" +#include "logic/shortcuts.h" +#include "logic/work.hpp" +#include "logic/state.hpp" +#include "compat/options.hpp" #include <QMainWindow> #include <QKeySequence> diff --git a/gui/main.cpp b/gui/main.cpp index a9252c4d..43fd4539 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -9,8 +9,8 @@ #endif #include "main-window.hpp" -#include "opentrack-compat/options.hpp" -#include "opentrack-compat/win32-com.hpp" +#include "compat/options.hpp" +#include "compat/win32-com.hpp" using namespace options; #include <QApplication> #include <QCommandLineParser> diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp index 108e1354..12b36e2a 100644 --- a/gui/mapping-window.cpp +++ b/gui/mapping-window.cpp @@ -7,7 +7,7 @@ */ #include "mapping-window.hpp" -#include "opentrack-logic/main-settings.hpp" +#include "logic/main-settings.hpp" #include "spline-widget/spline-widget.hpp" MapWidget::MapWidget(Mappings& m) : m(m) diff --git a/gui/mapping-window.hpp b/gui/mapping-window.hpp index e70a27c6..aeaed211 100644 --- a/gui/mapping-window.hpp +++ b/gui/mapping-window.hpp @@ -1,6 +1,6 @@ #pragma once #include <QWidget> -#include "opentrack-logic/mappings.hpp" +#include "logic/mappings.hpp" #include "ui_mapping-window.h" class MapWidget final : public QWidget diff --git a/gui/new_file_dialog.h b/gui/new_file_dialog.h index 5fdabb3a..8cb971c3 100644 --- a/gui/new_file_dialog.h +++ b/gui/new_file_dialog.h @@ -1,7 +1,7 @@ #pragma once #include "ui_new_config.h" -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" #include <QFile> #include <QRegExp> #include <QString> diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp index 1e8faa1c..6854107e 100644 --- a/gui/options-dialog.hpp +++ b/gui/options-dialog.hpp @@ -1,7 +1,7 @@ #pragma once #include "ui_options-dialog.h" -#include "opentrack-logic/shortcuts.h" +#include "logic/shortcuts.h" #include <QObject> #include <QWidget> #include <functional> diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp index 9c12f783..7df8e980 100644 --- a/gui/process_detector.cpp +++ b/gui/process_detector.cpp @@ -8,7 +8,7 @@ #include "process_detector.h" #include "main-window.hpp" -#include "opentrack-compat/process-list.hpp" +#include "compat/process-list.hpp" #include <QList> #include <QFileDialog> #include <QComboBox> diff --git a/gui/process_detector.h b/gui/process_detector.h index e395e1a2..e081fa27 100644 --- a/gui/process_detector.h +++ b/gui/process_detector.h @@ -13,7 +13,7 @@ #include <QTableWidget> #include <QResizeEvent> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; class FancyTable : public QTableWidget @@ -47,10 +47,10 @@ struct settings class process_detector : public QWidget { Q_OBJECT - + Ui_Dialog ui; settings s; - + int add_row(QString exe_name = "...", QString profile = ""); void add_items(); public: diff --git a/opentrack-logic/CMakeLists.txt b/logic/CMakeLists.txt index 88b0240f..88b0240f 100644 --- a/opentrack-logic/CMakeLists.txt +++ b/logic/CMakeLists.txt diff --git a/opentrack-logic/export.hpp b/logic/export.hpp index 2503f3a6..2503f3a6 100644 --- a/opentrack-logic/export.hpp +++ b/logic/export.hpp diff --git a/opentrack-logic/main-settings.hpp b/logic/main-settings.hpp index 29f7f62c..26313a26 100644 --- a/opentrack-logic/main-settings.hpp +++ b/logic/main-settings.hpp @@ -9,8 +9,8 @@ #pragma once #include <QString> -#include "opentrack-compat/options.hpp" -#include "opentrack/plugin-api.hpp" +#include "compat/options.hpp" +#include "api/plugin-api.hpp" using namespace options; diff --git a/opentrack-logic/mappings.hpp b/logic/mappings.hpp index 3e396980..0b9373c0 100644 --- a/opentrack-logic/mappings.hpp +++ b/logic/mappings.hpp @@ -8,7 +8,7 @@ #pragma once #include <QSettings> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; #include "spline-widget/spline.hpp" #include "main-settings.hpp" diff --git a/opentrack-logic/selected-libraries.cpp b/logic/selected-libraries.cpp index 4a1a9f09..4a1a9f09 100644 --- a/opentrack-logic/selected-libraries.cpp +++ b/logic/selected-libraries.cpp diff --git a/opentrack-logic/selected-libraries.hpp b/logic/selected-libraries.hpp index 2538adff..d782374c 100644 --- a/opentrack-logic/selected-libraries.hpp +++ b/logic/selected-libraries.hpp @@ -8,7 +8,7 @@ #pragma once -#include "opentrack/plugin-support.hpp" +#include "api/plugin-support.hpp" #include <QFrame> #include "export.hpp" diff --git a/opentrack-logic/shortcuts.cpp b/logic/shortcuts.cpp index 8d818180..8d818180 100644 --- a/opentrack-logic/shortcuts.cpp +++ b/logic/shortcuts.cpp diff --git a/opentrack-logic/shortcuts.h b/logic/shortcuts.h index b44864ba..d5dfd394 100644 --- a/opentrack-logic/shortcuts.h +++ b/logic/shortcuts.h @@ -15,11 +15,11 @@ #include "export.hpp" #include "qxt-mini/QxtGlobalShortcut" -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" #include "main-settings.hpp" #ifdef _WIN32 -# include "opentrack-dinput/keybinding-worker.hpp" +# include "dinput/keybinding-worker.hpp" #endif #if defined(__GNUC__) && !defined(_WIN32) diff --git a/opentrack-logic/simple-mat.cpp b/logic/simple-mat.cpp index 8c97f192..f9ed8613 100644 --- a/opentrack-logic/simple-mat.cpp +++ b/logic/simple-mat.cpp @@ -1,5 +1,5 @@ #include "simple-mat.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "compat/pi-constant.hpp" #include <cmath> namespace euler { diff --git a/opentrack-logic/simple-mat.hpp b/logic/simple-mat.hpp index 514e845f..514e845f 100644 --- a/opentrack-logic/simple-mat.hpp +++ b/logic/simple-mat.hpp diff --git a/opentrack-logic/state.hpp b/logic/state.hpp index 1c608f7a..4c3bb7a0 100644 --- a/opentrack-logic/state.hpp +++ b/logic/state.hpp @@ -8,9 +8,9 @@ #pragma once -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; -#include "opentrack/plugin-support.hpp" +#include "api/plugin-support.hpp" #include "main-settings.hpp" #include "mappings.hpp" #include "selected-libraries.hpp" diff --git a/opentrack-logic/tracker.cpp b/logic/tracker.cpp index d060fff1..c7580500 100644 --- a/opentrack-logic/tracker.cpp +++ b/logic/tracker.cpp @@ -12,7 +12,7 @@ * originally written by Wim Vriend. */ -#include "opentrack-compat/sleep.hpp" +#include "compat/sleep.hpp" #include "tracker.h" #include <cmath> @@ -77,7 +77,7 @@ void Tracker::t_compensate(const rmat& rmat, const euler_t& xyz_, euler_t& outpu output(0) = -ret(1); } -#include "opentrack-compat/nan.hpp" +#include "compat/nan.hpp" static inline double elide_nan(double value, double def) { diff --git a/opentrack-logic/tracker.h b/logic/tracker.h index 6dc48074..15fb9701 100644 --- a/opentrack-logic/tracker.h +++ b/logic/tracker.h @@ -10,16 +10,16 @@ #include <vector> -#include "opentrack-compat/pi-constant.hpp" -#include "opentrack-compat/timer.hpp" -#include "opentrack/plugin-support.hpp" +#include "compat/pi-constant.hpp" +#include "compat/timer.hpp" +#include "api/plugin-support.hpp" #include "mappings.hpp" #include "simple-mat.hpp" #include "selected-libraries.hpp" #include "spline-widget/spline.hpp" #include "main-settings.hpp" -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" #include "tracklogger.hpp" #include <QMutex> diff --git a/opentrack-logic/tracklogger.cpp b/logic/tracklogger.cpp index 64dda579..64dda579 100644 --- a/opentrack-logic/tracklogger.cpp +++ b/logic/tracklogger.cpp diff --git a/opentrack-logic/tracklogger.hpp b/logic/tracklogger.hpp index c6c145cf..52ab35bc 100644 --- a/opentrack-logic/tracklogger.hpp +++ b/logic/tracklogger.hpp @@ -1,7 +1,7 @@ #pragma once #include "main-settings.hpp" -#include "opentrack-compat/options.hpp" -#include "opentrack-compat/timer.hpp" +#include "compat/options.hpp" +#include "compat/timer.hpp" #include <fstream> #include <QString> diff --git a/opentrack-logic/win32-shortcuts.cpp b/logic/win32-shortcuts.cpp index df9145a0..df9145a0 100644 --- a/opentrack-logic/win32-shortcuts.cpp +++ b/logic/win32-shortcuts.cpp diff --git a/opentrack-logic/win32-shortcuts.h b/logic/win32-shortcuts.h index 7626a31f..7626a31f 100644 --- a/opentrack-logic/win32-shortcuts.h +++ b/logic/win32-shortcuts.h diff --git a/opentrack-logic/work.cpp b/logic/work.cpp index 8d00270b..8d00270b 100644 --- a/opentrack-logic/work.cpp +++ b/logic/work.cpp diff --git a/opentrack-logic/work.hpp b/logic/work.hpp index 4afb1da4..b20b1824 100644 --- a/opentrack-logic/work.hpp +++ b/logic/work.hpp @@ -9,7 +9,7 @@ #pragma once #include "main-settings.hpp" -#include "opentrack/plugin-support.hpp" +#include "api/plugin-support.hpp" #include "tracker.h" #include "shortcuts.h" #include "export.hpp" diff --git a/pose-widget/glwidget.cpp b/pose-widget/glwidget.cpp index 2e36a095..a2a76726 100644 --- a/pose-widget/glwidget.cpp +++ b/pose-widget/glwidget.cpp @@ -6,8 +6,8 @@ */ #include "glwidget.h" -#include "opentrack/is-window-visible.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/is-window-visible.hpp" +#include "compat/pi-constant.hpp" #include <cmath> #include <algorithm> #include <QPainter> diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index 95be2914..7965130c 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -10,9 +10,9 @@ #include <QtGlobal> #include <QWidget> #include <QPixmap> -#include "opentrack/plugin-api.hpp" -#include "opentrack-logic/simple-mat.hpp" -#include "opentrack-compat/timer.hpp" +#include "api/plugin-api.hpp" +#include "logic/simple-mat.hpp" +#include "compat/timer.hpp" #ifdef BUILD_pose_widget # define POSE_WIDGET_EXPORT Q_DECL_EXPORT diff --git a/proto-fg/ftnoir_protocol_fg.cpp b/proto-fg/ftnoir_protocol_fg.cpp index 660a7352..599a4d2c 100644 --- a/proto-fg/ftnoir_protocol_fg.cpp +++ b/proto-fg/ftnoir_protocol_fg.cpp @@ -9,7 +9,7 @@ * copyright notice and this permission notice appear in all copies. * */ #include "ftnoir_protocol_fg.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" // For Todd and Arda Kutlu diff --git a/proto-fg/ftnoir_protocol_fg.h b/proto-fg/ftnoir_protocol_fg.h index 5b1cbc81..77cb73c8 100644 --- a/proto-fg/ftnoir_protocol_fg.h +++ b/proto-fg/ftnoir_protocol_fg.h @@ -14,8 +14,8 @@ #include <QThread> #include <QUdpSocket> #include <QMessageBox> -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/proto-fg/ftnoir_protocol_fg_dialog.cpp b/proto-fg/ftnoir_protocol_fg_dialog.cpp index 6a3463b4..50ca2a73 100644 --- a/proto-fg/ftnoir_protocol_fg_dialog.cpp +++ b/proto-fg/ftnoir_protocol_fg_dialog.cpp @@ -11,7 +11,7 @@ #include "ftnoir_protocol_fg.h" #include <QObject> #include <QFile> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" //******************************************************************************************************* // FaceTrackNoIR Client Settings-dialog. diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp index cb289747..92d9bd88 100644 --- a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp +++ b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp @@ -9,7 +9,7 @@ * copyright notice and this permission notice appear in all copies. * */ #include "ftnoir_protocol_fsuipc.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cmath> diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.h b/proto-fsuipc/ftnoir_protocol_fsuipc.h index 42f421ad..8207ac9f 100644 --- a/proto-fsuipc/ftnoir_protocol_fsuipc.h +++ b/proto-fsuipc/ftnoir_protocol_fsuipc.h @@ -15,7 +15,7 @@ #include <windows.h> #include <stdlib.h> #include "FSUIPC_User.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_fsuipccontrols.h" #include <QMessageBox> #include <QSettings> @@ -24,7 +24,7 @@ #include <QDebug> #include <QFile> #include <QFileDialog> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; #define FSUIPC_FILENAME "C:\\Program Files\\Microsoft Games\\Flight Simulator 9\\Modules\\FSUIPC.dll" diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp index 504b2dcb..07507cfb 100644 --- a/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp +++ b/proto-fsuipc/ftnoir_protocol_fsuipc_dialog.cpp @@ -9,7 +9,7 @@ * copyright notice and this permission notice appear in all copies. * */ #include "ftnoir_protocol_fsuipc.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" FSUIPCControls::FSUIPCControls() { diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp index 851cd939..7cd0b5f7 100644 --- a/proto-ft/ftnoir_protocol_ft.cpp +++ b/proto-ft/ftnoir_protocol_ft.cpp @@ -9,7 +9,7 @@ #include "ftnoir_protocol_ft.h" #include "csv/csv.h" #include "opentrack-library-path.h" -#include "opentrack-compat/pi-constant.hpp" +#include "compat/pi-constant.hpp" check_for_first_run FTNoIR_Protocol::runonce_check = check_for_first_run(); diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h index d90d916e..246a73c4 100644 --- a/proto-ft/ftnoir_protocol_ft.h +++ b/proto-ft/ftnoir_protocol_ft.h @@ -8,7 +8,7 @@ #pragma once #include "ui_ftnoir_ftcontrols.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <QMessageBox> #include <QSettings> #include <QLibrary> @@ -18,8 +18,8 @@ #include <QString> #include <QMutex> #include <QMutexLocker> -#include "opentrack-compat/shm.h" -#include "opentrack-compat/options.hpp" +#include "compat/shm.h" +#include "compat/options.hpp" #include "freetrackclient/fttypes.h" #include <memory> #include "mutex.hpp" diff --git a/proto-ftn/ftnoir_protocol_ftn.cpp b/proto-ftn/ftnoir_protocol_ftn.cpp index db852f55..51db0f9d 100644 --- a/proto-ftn/ftnoir_protocol_ftn.cpp +++ b/proto-ftn/ftnoir_protocol_ftn.cpp @@ -10,7 +10,7 @@ */ #include "ftnoir_protocol_ftn.h" #include <QFile> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" FTNoIR_Protocol::FTNoIR_Protocol() { diff --git a/proto-ftn/ftnoir_protocol_ftn.h b/proto-ftn/ftnoir_protocol_ftn.h index d8b8aff0..9e647980 100644 --- a/proto-ftn/ftnoir_protocol_ftn.h +++ b/proto-ftn/ftnoir_protocol_ftn.h @@ -15,8 +15,8 @@ #include <QUdpSocket> #include <QMessageBox> #include <cmath> -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/proto-ftn/ftnoir_protocol_ftn_dialog.cpp b/proto-ftn/ftnoir_protocol_ftn_dialog.cpp index 7e191336..70416a69 100644 --- a/proto-ftn/ftnoir_protocol_ftn_dialog.cpp +++ b/proto-ftn/ftnoir_protocol_ftn_dialog.cpp @@ -9,7 +9,7 @@ * copyright notice and this permission notice appear in all copies. * */ #include "ftnoir_protocol_ftn.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" FTNControls::FTNControls() { diff --git a/proto-libevdev/ftnoir_protocol_libevdev.cpp b/proto-libevdev/ftnoir_protocol_libevdev.cpp index 96805b39..96411ae3 100644 --- a/proto-libevdev/ftnoir_protocol_libevdev.cpp +++ b/proto-libevdev/ftnoir_protocol_libevdev.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_libevdev.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cstdio> #include <algorithm> diff --git a/proto-libevdev/ftnoir_protocol_libevdev.h b/proto-libevdev/ftnoir_protocol_libevdev.h index ecb3b201..79be398b 100644 --- a/proto-libevdev/ftnoir_protocol_libevdev.h +++ b/proto-libevdev/ftnoir_protocol_libevdev.h @@ -8,7 +8,7 @@ #include "ui_ftnoir_libevdev_controls.h" #include <QMessageBox> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" extern "C" { # include <libevdev/libevdev.h> diff --git a/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp b/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp index bb63ba6a..afccf908 100644 --- a/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp +++ b/proto-libevdev/ftnoir_protocol_libevdev_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_libevdev.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" LibevdevControls::LibevdevControls() { diff --git a/proto-mouse/ftnoir_protocol_mouse.cpp b/proto-mouse/ftnoir_protocol_mouse.cpp index 73616785..ced53bc6 100644 --- a/proto-mouse/ftnoir_protocol_mouse.cpp +++ b/proto-mouse/ftnoir_protocol_mouse.cpp @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ #include "ftnoir_protocol_mouse.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cmath> #include <algorithm> #include <windows.h> diff --git a/proto-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h index 2d96915e..0781366c 100644 --- a/proto-mouse/ftnoir_protocol_mouse.h +++ b/proto-mouse/ftnoir_protocol_mouse.h @@ -9,8 +9,8 @@ #include "ui_ftnoir_mousecontrols.h" #include <QDebug> -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/proto-mouse/ftnoir_protocol_mouse_dialog.cpp b/proto-mouse/ftnoir_protocol_mouse_dialog.cpp index d8517487..77b1ff2e 100644 --- a/proto-mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/proto-mouse/ftnoir_protocol_mouse_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_mouse.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" MOUSEControls::MOUSEControls() { diff --git a/proto-sc/ftnoir_protocol_sc.cpp b/proto-sc/ftnoir_protocol_sc.cpp index fb60cb01..cea064ea 100644 --- a/proto-sc/ftnoir_protocol_sc.cpp +++ b/proto-sc/ftnoir_protocol_sc.cpp @@ -10,7 +10,7 @@ * copyright notice and this permission notice appear in all copies. * */ #include "ftnoir_protocol_sc.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "opentrack-library-path.h" FTNoIR_Protocol::FTNoIR_Protocol() : should_stop(false), hSimConnect(nullptr) diff --git a/proto-sc/ftnoir_protocol_sc.h b/proto-sc/ftnoir_protocol_sc.h index dcc0ca77..0da6c242 100644 --- a/proto-sc/ftnoir_protocol_sc.h +++ b/proto-sc/ftnoir_protocol_sc.h @@ -10,7 +10,7 @@ * copyright notice and this permission notice appear in all copies. * */ #pragma once -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_sccontrols.h" #include <QThread> @@ -20,7 +20,7 @@ #include <QProcess> #include <QDebug> #include <QFile> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; #include <windows.h> diff --git a/proto-sc/ftnoir_protocol_sc_dialog.cpp b/proto-sc/ftnoir_protocol_sc_dialog.cpp index e2ff82fc..a14c6b44 100644 --- a/proto-sc/ftnoir_protocol_sc_dialog.cpp +++ b/proto-sc/ftnoir_protocol_sc_dialog.cpp @@ -10,7 +10,7 @@ */ #include "ftnoir_protocol_sc.h" #include <QDebug> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" SCControls::SCControls() { diff --git a/proto-vjoystick/vjoystick.cpp b/proto-vjoystick/vjoystick.cpp index d14166be..ad582b6d 100644 --- a/proto-vjoystick/vjoystick.cpp +++ b/proto-vjoystick/vjoystick.cpp @@ -1,5 +1,5 @@ #include "vjoystick.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cstring> #include <QDebug> diff --git a/proto-vjoystick/vjoystick.h b/proto-vjoystick/vjoystick.h index c4cb7e69..2d3fd378 100644 --- a/proto-vjoystick/vjoystick.h +++ b/proto-vjoystick/vjoystick.h @@ -7,7 +7,7 @@ */ #pragma once #include "ui_vjoystick.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <windows.h> diff --git a/proto-vjoystick/vjoystick_dialog.cpp b/proto-vjoystick/vjoystick_dialog.cpp index 136e898b..461230a6 100644 --- a/proto-vjoystick/vjoystick_dialog.cpp +++ b/proto-vjoystick/vjoystick_dialog.cpp @@ -1,5 +1,5 @@ #include "vjoystick.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" vjoystick_dialog::vjoystick_dialog() { diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h index f78e1364..8b41824c 100644 --- a/proto-wine/ftnoir_protocol_wine.h +++ b/proto-wine/ftnoir_protocol_wine.h @@ -8,8 +8,8 @@ #include <QMutex> #include <QMutexLocker> #include <QFile> -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/shm.h" +#include "api/plugin-api.hpp" +#include "compat/shm.h" #include "wine-shm.h" class FTNoIR_Protocol : public IProtocol diff --git a/proto-wine/ftnoir_protocol_wine_dialog.cpp b/proto-wine/ftnoir_protocol_wine_dialog.cpp index d5cb4494..a388df70 100644 --- a/proto-wine/ftnoir_protocol_wine_dialog.cpp +++ b/proto-wine/ftnoir_protocol_wine_dialog.cpp @@ -1,6 +1,6 @@ #include "ftnoir_protocol_wine.h" #include <QDebug> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" FTControls::FTControls() { diff --git a/proto-wine/opentrack-wrapper-wine-main.cxx b/proto-wine/opentrack-wrapper-wine-main.cxx index 082e5dde..1c88755a 100644 --- a/proto-wine/opentrack-wrapper-wine-main.cxx +++ b/proto-wine/opentrack-wrapper-wine-main.cxx @@ -6,13 +6,13 @@ #include <cstdio> #include "freetrackclient/fttypes.h" #include "wine-shm.h" -#include "opentrack-compat/export.hpp" +#include "compat/export.hpp" enum Axis { TX = 0, TY, TZ, Yaw, Pitch, Roll }; -#include "opentrack-compat/shm.h" +#include "compat/shm.h" void create_registry_key(void); diff --git a/proto-wine/opentrack-wrapper-wine-posix.cxx b/proto-wine/opentrack-wrapper-wine-posix.cxx index 50cce728..21c7622b 100644 --- a/proto-wine/opentrack-wrapper-wine-posix.cxx +++ b/proto-wine/opentrack-wrapper-wine-posix.cxx @@ -3,5 +3,5 @@ #endif #define PortableLockedShm ShmPosix -#include "opentrack-compat/shm.h" -#include "opentrack-compat/shm.cpp" +#include "compat/shm.h" +#include "compat/shm.cpp" diff --git a/proto-wine/opentrack-wrapper-wine-windows.cxx b/proto-wine/opentrack-wrapper-wine-windows.cxx index cc8ae63a..698e3c3b 100644 --- a/proto-wine/opentrack-wrapper-wine-windows.cxx +++ b/proto-wine/opentrack-wrapper-wine-windows.cxx @@ -3,8 +3,8 @@ #endif #define PortableLockedShm ShmWine -#include "opentrack-compat/shm.h" -#include "opentrack-compat/shm.cpp" +#include "compat/shm.h" +#include "compat/shm.cpp" #include "wine-shm.h" #define OPENTRACK_NO_QT_PATH #include "opentrack-library-path.h" diff --git a/spline-widget/spline-widget.cpp b/spline-widget/spline-widget.cpp index 17dbe31d..1f049339 100644 --- a/spline-widget/spline-widget.cpp +++ b/spline-widget/spline-widget.cpp @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; #include "spline-widget.hpp" #include <QPainter> diff --git a/spline-widget/spline-widget.hpp b/spline-widget/spline-widget.hpp index 577e6f7f..1dbdb8e1 100644 --- a/spline-widget/spline-widget.hpp +++ b/spline-widget/spline-widget.hpp @@ -13,7 +13,7 @@ #include <QtGui> #include <QPointF> #include "spline.hpp" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" class SPLINE_WIDGET_EXPORT spline_widget : public QWidget { diff --git a/spline-widget/spline.hpp b/spline-widget/spline.hpp index 6387c87a..26775402 100644 --- a/spline-widget/spline.hpp +++ b/spline-widget/spline.hpp @@ -16,7 +16,7 @@ #include <QMutex> #include <vector> #include <limits> -#include "opentrack-compat/qcopyable-mutex.hpp" +#include "compat/qcopyable-mutex.hpp" #ifdef BUILD_spline_widget # define SPLINE_WIDGET_EXPORT Q_DECL_EXPORT diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp index a1ca0ac5..9af182e5 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.cpp +++ b/tracker-aruco/ftnoir_tracker_aruco.cpp @@ -6,14 +6,14 @@ */ #include "ftnoir_tracker_aruco.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <opencv2/core.hpp> #include <opencv2/videoio.hpp> #include <opencv2/imgproc.hpp> #include <opencv2/calib3d.hpp> -#include "opentrack-compat/camera-names.hpp" -#include "opentrack-compat/sleep.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "compat/camera-names.hpp" +#include "compat/sleep.hpp" +#include "compat/pi-constant.hpp" #include <QMutexLocker> #include <QDebug> diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h index 6c28c7db..aeabd438 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.h +++ b/tracker-aruco/ftnoir_tracker_aruco.h @@ -8,7 +8,7 @@ #pragma once #include "ui_aruco-trackercontrols.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "include/markerdetector.h" #include "cv/camera-dialog.hpp" @@ -26,7 +26,7 @@ #include <cinttypes> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp index 9a5697dd..800428aa 100644 --- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp +++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp @@ -1,6 +1,6 @@ #include "ftnoir_tracker_freepie-udp.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/pi-constant.hpp" #include <cinttypes> #include <algorithm> diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h index 9d18c7d1..05228006 100644 --- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h +++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h @@ -9,8 +9,8 @@ #include <QUdpSocket> #include <QThread> #include "ui_freepie-udp-controls.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp b/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp index 3ebe359f..42a8308b 100644 --- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp +++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_freepie-udp.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerDialog::TrackerDialog() { diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h index 03d00205..0969fd9c 100644 --- a/tracker-hatire/ftnoir_tracker_hat.h +++ b/tracker-hatire/ftnoir_tracker_hat.h @@ -1,7 +1,7 @@ #pragma once #include "thread.hpp" -#include "opentrack/plugin-support.hpp" +#include "api/plugin-support.hpp" #include "ftnoir_tracker_hat_settings.h" #include "ftnoir_arduino_type.h" diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.h b/tracker-hatire/ftnoir_tracker_hat_dialog.h index b93c4301..82615d53 100644 --- a/tracker-hatire/ftnoir_tracker_hat_dialog.h +++ b/tracker-hatire/ftnoir_tracker_hat_dialog.h @@ -1,4 +1,4 @@ -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ftnoir_tracker_hat_settings.h" #include "ftnoir_tracker_hat.h" #include "ui_ftnoir_hatcontrols.h" diff --git a/tracker-hatire/ftnoir_tracker_hat_settings.h b/tracker-hatire/ftnoir_tracker_hat_settings.h index 0450856b..fa24996e 100644 --- a/tracker-hatire/ftnoir_tracker_hat_settings.h +++ b/tracker-hatire/ftnoir_tracker_hat_settings.h @@ -8,7 +8,7 @@ #pragma once #include <QSerialPort> -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; diff --git a/tracker-hatire/thread.cpp b/tracker-hatire/thread.cpp index 764bd875..4f5feae5 100644 --- a/tracker-hatire/thread.cpp +++ b/tracker-hatire/thread.cpp @@ -1,5 +1,5 @@ #include "thread.hpp" -#include "opentrack-compat/sleep.hpp" +#include "compat/sleep.hpp" #include <utility> #include <QTextStream> diff --git a/tracker-hatire/thread.hpp b/tracker-hatire/thread.hpp index 26491cfe..dcdc13ee 100644 --- a/tracker-hatire/thread.hpp +++ b/tracker-hatire/thread.hpp @@ -10,8 +10,8 @@ #include <QFile> #include <QCoreApplication> -#include "opentrack/variance.hpp" -#include "opentrack-compat/timer.hpp" +#include "api/variance.hpp" +#include "compat/timer.hpp" enum results { diff --git a/tracker-ht/ftnoir_tracker_ht.cpp b/tracker-ht/ftnoir_tracker_ht.cpp index 1ffc387e..045d05f8 100644 --- a/tracker-ht/ftnoir_tracker_ht.cpp +++ b/tracker-ht/ftnoir_tracker_ht.cpp @@ -1,21 +1,21 @@ #include "headtracker-ftnoir.h" #include "ftnoir_tracker_ht.h" #include "ui_ht-trackercontrols.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cmath> -#include "opentrack/camera-names.hpp" -#include "opentrack-compat/sleep.hpp" +#include "api/camera-names.hpp" +#include "compat/sleep.hpp" typedef struct { - int width; - int height; + int width; + int height; } resolution_tuple; static resolution_tuple resolution_choices[] = { - { 640, 480 }, - { 320, 240 }, - { 320, 200 }, - { 0, 0 } + { 640, 480 }, + { 320, 240 }, + { 320, 200 }, + { 0, 0 } }; void Tracker::load_settings(ht_config_t* config) @@ -63,9 +63,9 @@ void Tracker::load_settings(ht_config_t* config) int res = s.resolution; if (res < 0 || res >= (int)(sizeof(resolution_choices) / sizeof(resolution_tuple))) - res = 0; - resolution_tuple r = resolution_choices[res]; - config->force_width = r.width; + res = 0; + resolution_tuple r = resolution_choices[res]; + config->force_width = r.width; config->force_height = r.height; config->flandmark_delay = 50; for (int i = 0; i < 5; i++) @@ -86,10 +86,10 @@ Tracker::~Tracker() should_stop = true; wait(); ht_free_context(ht); - if (layout) - delete layout; - if (videoWidget) - delete videoWidget; + if (layout) + delete layout; + if (videoWidget) + delete videoWidget; } void Tracker::start_tracker(QFrame* videoframe) diff --git a/tracker-ht/ftnoir_tracker_ht.h b/tracker-ht/ftnoir_tracker_ht.h index 1ec3467a..96fd258d 100644 --- a/tracker-ht/ftnoir_tracker_ht.h +++ b/tracker-ht/ftnoir_tracker_ht.h @@ -10,11 +10,11 @@ #include "headtracker-ftnoir.h" #include "ui_ht-trackercontrols.h" #include "ht_video_widget.h" -#include "opentrack-compat/shm.h" +#include "compat/shm.h" #include <QObject> -#include "opentrack-compat/options.hpp" -#include "opentrack/plugin-api.hpp" -#include "opentrack/opencv-camera-dialog.hpp" +#include "compat/options.hpp" +#include "api/plugin-api.hpp" +#include "api/opencv-camera-dialog.hpp" #include <QThread> #include <QMutex> diff --git a/tracker-hydra/ftnoir_tracker_hydra.cpp b/tracker-hydra/ftnoir_tracker_hydra.cpp index 33156f85..6b52153f 100644 --- a/tracker-hydra/ftnoir_tracker_hydra.cpp +++ b/tracker-hydra/ftnoir_tracker_hydra.cpp @@ -1,7 +1,7 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_hydra.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/pi-constant.hpp" #include <cstdio> #include <cmath> #ifdef _WIN32 diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h index 94396b7c..d8fe6afb 100644 --- a/tracker-hydra/ftnoir_tracker_hydra.h +++ b/tracker-hydra/ftnoir_tracker_hydra.h @@ -1,6 +1,6 @@ #include "ui_ftnoir_hydra_clientcontrols.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp b/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp index 773f8b50..42019dfa 100644 --- a/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp +++ b/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_hydra.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp index d10b15ca..263a5cb0 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick.cpp @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ #include "ftnoir_tracker_joystick.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <QMutexLocker> FTNoIR_Tracker::FTNoIR_Tracker() diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h index 2d776ebf..0cd26f36 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.h +++ b/tracker-joystick/ftnoir_tracker_joystick.h @@ -15,10 +15,10 @@ #include <QFrame> #include <QStringList> #include <cmath> -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" -#include "opentrack-dinput/win32-joystick.hpp" -#include "opentrack-compat/options.hpp" +#include "dinput/win32-joystick.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp index 035beef6..1d67cdbb 100644 --- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_joystick.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() : tracker(nullptr) { diff --git a/tracker-pt/camera.cpp b/tracker-pt/camera.cpp index e5901da1..c15bb2be 100644 --- a/tracker-pt/camera.cpp +++ b/tracker-pt/camera.cpp @@ -6,8 +6,8 @@ */ #include "camera.h" -#include "opentrack-compat/sleep.hpp" -#include "opentrack-compat/camera-names.hpp" +#include "compat/sleep.hpp" +#include "compat/camera-names.hpp" #include <string> #include <QDebug> diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 429a0305..eaf1de0d 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -12,8 +12,8 @@ #include <QDebug> #include <QFile> #include <QCoreApplication> -#include "opentrack-compat/camera-names.hpp" -#include "opentrack-compat/sleep.hpp" +#include "compat/camera-names.hpp" +#include "compat/sleep.hpp" #include <functional> //#define PT_PERF_LOG //log performance diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index f515715e..04a6646f 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -9,15 +9,15 @@ #ifndef FTNOIR_TRACKER_PT_H #define FTNOIR_TRACKER_PT_H -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ftnoir_tracker_pt_settings.h" #include "camera.h" #include "point_extractor.h" #include "point_tracker.h" -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include "cv/camera-dialog.hpp" #include "cv/video-widget.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "compat/pi-constant.hpp" #include <QThread> #include <QMutex> diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index 9b09722f..307be1f2 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -12,7 +12,7 @@ #include <QDebug> #include <opencv2/core/core.hpp> #include <memory> -#include "opentrack-compat/camera-names.hpp" +#include "compat/camera-names.hpp" #include <vector> //----------------------------------------------------------------------------- diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h index d2647a94..49e8f1b0 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.h +++ b/tracker-pt/ftnoir_tracker_pt_dialog.h @@ -8,7 +8,7 @@ #ifndef FTNOIR_TRACKER_PT_DIALOG_H #define FTNOIR_TRACKER_PT_DIALOG_H -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ftnoir_tracker_pt_settings.h" #include "ftnoir_tracker_pt.h" #include "ui_FTNoIR_PT_Controls.h" diff --git a/tracker-pt/ftnoir_tracker_pt_settings.h b/tracker-pt/ftnoir_tracker_pt_settings.h index f5256f18..c076082a 100644 --- a/tracker-pt/ftnoir_tracker_pt_settings.h +++ b/tracker-pt/ftnoir_tracker_pt_settings.h @@ -8,7 +8,7 @@ #pragma once -#include "opentrack-compat/pi-constant.hpp" +#include "compat/pi-constant.hpp" #include <limits> #include <opencv2/core.hpp> @@ -28,7 +28,7 @@ struct pt_types using mat22 = mat<2, 2>; }; -#include "opentrack-compat/options.hpp" +#include "compat/options.hpp" using namespace options; struct settings_pt : opts diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp index e749934e..f4034b28 100644 --- a/tracker-pt/point_extractor.cpp +++ b/tracker-pt/point_extractor.cpp @@ -10,7 +10,7 @@ #include <QDebug> #ifdef DEBUG_EXTRACTION -# include "opentrack-compat/timer.hpp" +# include "compat/timer.hpp" #endif #include <opencv2/videoio.hpp> diff --git a/tracker-pt/point_extractor.h b/tracker-pt/point_extractor.h index 9ef2adb4..0a019ec0 100644 --- a/tracker-pt/point_extractor.h +++ b/tracker-pt/point_extractor.h @@ -13,7 +13,7 @@ #include <opencv2/imgproc/imgproc.hpp> #include "ftnoir_tracker_pt_settings.h" -#include "opentrack-compat/pi-constant.hpp" +#include "compat/pi-constant.hpp" #include <vector> diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index a2511118..fe8ff0f2 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -6,7 +6,7 @@ */ #include "point_tracker.h" -#include "opentrack-compat/nan.hpp" +#include "compat/nan.hpp" #include <vector> #include <algorithm> @@ -325,11 +325,17 @@ int PointTracker::POSIT(const PointModel& model, const PointOrder& order_, f foc for (int i = 0; i < 3; i++) for (int j = 0; j < 3; j++) if (nanp(r(i, j))) + { + qDebug() << "posit nan"; return -1; + } for (unsigned i = 0; i < 3; i++) if (nanp(t[i])) + { + qDebug() << "posit nan"; return -1; + } // apply results X_CM.R = r; diff --git a/tracker-pt/point_tracker.h b/tracker-pt/point_tracker.h index 00e371f5..6ed91069 100644 --- a/tracker-pt/point_tracker.h +++ b/tracker-pt/point_tracker.h @@ -8,7 +8,7 @@ #ifndef POINTTRACKER_H #define POINTTRACKER_H -#include "opentrack-compat/timer.hpp" +#include "compat/timer.hpp" #include "ftnoir_tracker_pt_settings.h" #include <opencv2/core/core.hpp> #include <memory> diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_025.cpp index e6cbe3de..feacf5b1 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_025.cpp +++ b/tracker-rift-025/ftnoir_tracker_rift_025.cpp @@ -1,7 +1,7 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_rift_025.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/pi-constant.hpp" #include <OVR.h> #include <cstdio> #include <cmath> diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.h b/tracker-rift-025/ftnoir_tracker_rift_025.h index ea4d224f..33f615ea 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_025.h +++ b/tracker-rift-025/ftnoir_tracker_rift_025.h @@ -1,7 +1,7 @@ #pragma once #include "ui_ftnoir_rift_clientcontrols_025.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" #include <OVR.h> #include <cmath> #include <memory> diff --git a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp index f13883e0..c3a6a198 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp +++ b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_rift_025.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_042.cpp index a49f7d23..901e4d1f 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_042.cpp @@ -1,7 +1,7 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_rift_042.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/pi-constant.hpp" #include <OVR_CAPI.h> #include <Kernel/OVR_Math.h> #include <cstdio> diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.h b/tracker-rift-042/ftnoir_tracker_rift_042.h index e39ac654..55a59f18 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_042.h +++ b/tracker-rift-042/ftnoir_tracker_rift_042.h @@ -1,7 +1,7 @@ #pragma once #include "ui_ftnoir_rift_clientcontrols_042.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" #include <OVR.h> #include <QMessageBox> #include <QWaitCondition> diff --git a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp index 3fcf632c..f520b4b5 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_rift_042.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp index d3019ac5..ce1f741a 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_080.cpp @@ -1,7 +1,7 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_rift_080.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/pi-constant.hpp" #include <OVR_CAPI.h> #include <Extras/OVR_Math.h> #include <OVR_CAPI_0_8_0.h> diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h index 280a729c..6adf6bcf 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.h +++ b/tracker-rift-080/ftnoir_tracker_rift_080.h @@ -1,7 +1,7 @@ #pragma once #include "ui_ftnoir_rift_clientcontrols_080.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" #include <OVR.h> #include <cmath> #include <QMessageBox> diff --git a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp index fd28475d..aba4f6bf 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_rift_080.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index 4a59d74a..1ab32992 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -8,7 +8,7 @@ #include "ftnoir_tracker_rs.h" #include "ftnoir_tracker_rs_controls.h" #include "imagewidget.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "opentrack-library-path.h" #include <QMessageBox> #include <QProcess> @@ -46,7 +46,7 @@ void RSTracker::configurePreviewFrame() void RSTracker::start_tracker(QFrame* previewFrame) { - qDebug() << "tracker_rs: starting tracker"; + qDebug() << "tracker_rs: starting tracker"; mPreviewFrame = previewFrame; @@ -58,20 +58,20 @@ void RSTracker::start_tracker(QFrame* previewFrame) } void RSTracker::startPreview(){ - qDebug() << "tracker_rs: starting preview"; + qDebug() << "tracker_rs: starting preview"; mPreviewUpdateTimer.start(kPreviewUpdateInterval); } void RSTracker::updatePreview(){ - if (mImageWidget != nullptr && mImageWidget->isEnabled() && mTrackerWorkerThread.isRunning()) - mImageWidget->setImage(mTrackerWorkerThread.getPreview()); - else - qDebug() << "tracker_rs: not updating preview. worker thread running: " << mTrackerWorkerThread.isRunning(); + if (mImageWidget != nullptr && mImageWidget->isEnabled() && mTrackerWorkerThread.isRunning()) + mImageWidget->setImage(mTrackerWorkerThread.getPreview()); + else + qDebug() << "tracker_rs: not updating preview. worker thread running: " << mTrackerWorkerThread.isRunning(); } void RSTracker::stopPreview(){ - mPreviewUpdateTimer.stop(); - qDebug() << "tracker_rs: stopped preview"; + mPreviewUpdateTimer.stop(); + qDebug() << "tracker_rs: stopped preview"; } void RSTracker::handleTrackingEnded(int exitCode){ @@ -98,17 +98,17 @@ void RSTracker::showRealSenseErrorMessageBox(int exitCode) msgBox.setIcon(QMessageBox::Critical); msgBox.setText("RealSense Tracking Error"); - switch(exitCode){ - case -101: //The implementation got an invalid handle from the RealSense SDK session/modules + switch(exitCode){ + case -101: //The implementation got an invalid handle from the RealSense SDK session/modules msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please make sure SDK Runtime 2016 R2 is installed."); - break; - case -301: //RealSense SDK runtime execution aborted. - msgBox.setInformativeText("Tracking stopped after the RealSense SDK Runtime execution has aborted."); - break; - case -601: //RealSense Camera stream configuration has changed. - msgBox.setInformativeText("Tracking stopped after another program changed camera streams configuration."); - break; - default: + break; + case -301: //RealSense SDK runtime execution aborted. + msgBox.setInformativeText("Tracking stopped after the RealSense SDK Runtime execution has aborted."); + break; + case -601: //RealSense Camera stream configuration has changed. + msgBox.setInformativeText("Tracking stopped after another program changed camera streams configuration."); + break; + default: msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime 2016 R2 to be installed."); } @@ -126,7 +126,7 @@ void RSTracker::data(double *data) } RSTracker::~RSTracker() { - qDebug() << "tracker is being destroyed."; + qDebug() << "tracker is being destroyed."; stopPreview(); diff --git a/tracker-rs/ftnoir_tracker_rs.h b/tracker-rs/ftnoir_tracker_rs.h index 845e0beb..083794ed 100644 --- a/tracker-rs/ftnoir_tracker_rs.h +++ b/tracker-rs/ftnoir_tracker_rs.h @@ -7,7 +7,7 @@ #pragma once -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include "ui_ftnoir_tracker_rs_controls.h" #include "ftnoir_tracker_rs_worker.h" #include <QTimer> diff --git a/tracker-test/test.cpp b/tracker-test/test.cpp index b6cc742e..3e0db547 100644 --- a/tracker-test/test.cpp +++ b/tracker-test/test.cpp @@ -7,7 +7,7 @@ */ #include "test.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" #include <cmath> #include <QDebug> diff --git a/tracker-test/test.h b/tracker-test/test.h index afb11f6f..786d7705 100644 --- a/tracker-test/test.h +++ b/tracker-test/test.h @@ -1,8 +1,8 @@ #pragma once #include "ui_test.h" -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/timer.hpp" -#include "opentrack-compat/pi-constant.hpp" +#include "api/plugin-api.hpp" +#include "compat/timer.hpp" +#include "compat/pi-constant.hpp" class FTNoIR_Tracker : public ITracker { diff --git a/tracker-test/test_dialog.cpp b/tracker-test/test_dialog.cpp index 38578ffc..5d33555b 100644 --- a/tracker-test/test_dialog.cpp +++ b/tracker-test/test_dialog.cpp @@ -1,3 +1,3 @@ #include "test.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" diff --git a/tracker-udp/ftnoir_tracker_udp.cpp b/tracker-udp/ftnoir_tracker_udp.cpp index bc3bebc6..8438d48f 100644 --- a/tracker-udp/ftnoir_tracker_udp.cpp +++ b/tracker-udp/ftnoir_tracker_udp.cpp @@ -7,7 +7,7 @@ */ #include "ftnoir_tracker_udp.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" FTNoIR_Tracker::FTNoIR_Tracker() : last_recv_pose { 0,0,0, 0,0,0 }, should_quit(false) {} diff --git a/tracker-udp/ftnoir_tracker_udp.h b/tracker-udp/ftnoir_tracker_udp.h index 3f0e6d8c..292df1f5 100644 --- a/tracker-udp/ftnoir_tracker_udp.h +++ b/tracker-udp/ftnoir_tracker_udp.h @@ -3,8 +3,8 @@ #include <QUdpSocket> #include <QThread> #include <cmath> -#include "opentrack/plugin-api.hpp" -#include "opentrack-compat/options.hpp" +#include "api/plugin-api.hpp" +#include "compat/options.hpp" using namespace options; struct settings : opts { diff --git a/tracker-udp/ftnoir_tracker_udp_dialog.cpp b/tracker-udp/ftnoir_tracker_udp_dialog.cpp index df274541..af94183c 100644 --- a/tracker-udp/ftnoir_tracker_udp_dialog.cpp +++ b/tracker-udp/ftnoir_tracker_udp_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_udp.h" -#include "opentrack/plugin-api.hpp" +#include "api/plugin-api.hpp" TrackerControls::TrackerControls() { |