diff options
100 files changed, 327 insertions, 290 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9406680e..0b350598 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,7 @@ macro(opentrack_library n dir) endmacro() opentrack_module(opentrack-bin facetracknoir) +opentrack_module(opentrack-api opentrack) opentrack_module(opentrack-pose-widget ftnoir_posewidget) opentrack_module(opentrack-spline-widget qfunctionconfigurator) @@ -184,7 +185,7 @@ file(GLOB opentrack-freetrack-c "freetrackclient/*.c") if(SDK_XPLANE) # probably librt already included - add_library(opentrack-xplane-plugin SHARED ${opentrack-xplane-plugin-c}) + add_library(opentrack-xplane-plugin STATIC ${opentrack-xplane-plugin-c}) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC AND NOT APPLE) SET_TARGET_PROPERTIES(opentrack-xplane-plugin PROPERTIES LINK_FLAGS @@ -209,7 +210,7 @@ if(QT_USE_FILE) INCLUDE(${QT_USE_FILE}) endif() -add_library(opentrack-compat SHARED ${opentrack-compat-c}) +add_library(opentrack-compat STATIC ${opentrack-compat-c}) if(NOT WIN32 AND NOT APPLE) target_link_libraries(opentrack-compat rt) endif() @@ -222,12 +223,12 @@ endif() set(MY_QT_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Core_LIBRARIES} ${my-qt-deps}) -add_library(opentrack-csv SHARED ${opentrack-csv-c}) +add_library(opentrack-csv STATIC ${opentrack-csv-c}) target_link_libraries(opentrack-csv ${MY_QT_LIBS}) -add_library(opentrack-pose-widget SHARED ${opentrack-pose-widget-c} ${opentrack-pose-widget-rcc}) +add_library(opentrack-pose-widget STATIC ${opentrack-pose-widget-c} ${opentrack-pose-widget-rcc}) target_link_libraries(opentrack-pose-widget ${MY_QT_LIBS}) -add_library(opentrack-spline-widget SHARED ${opentrack-spline-widget-c}) +add_library(opentrack-spline-widget STATIC ${opentrack-spline-widget-c}) target_link_libraries(opentrack-spline-widget ${MY_QT_LIBS}) add_library(opentrack-version STATIC ${opentrack-version-c}) @@ -395,7 +396,7 @@ else() set(opentrack-win32-executable "") endif() if(UNIX OR APPLE) - add_library(opentrack-qxt-mini SHARED ${qxt-mini-c}) + add_library(opentrack-qxt-mini STATIC ${qxt-mini-c}) SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES COMPILE_FLAGS "-DBUILD_QXT_CORE=42 -DBUILD_QXT_WIDGETS=42 -DBUILD_QXT_GUI=42") target_link_libraries(opentrack-qxt-mini ${MY_QT_LIBS}) if(NOT APPLE) @@ -403,7 +404,9 @@ if(UNIX OR APPLE) endif() endif() +add_library(opentrack-api STATIC ${opentrack-api-c}) add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-uih} ${opentrack-bin-rcc}) +target_link_libraries(opentrack opentrack-api) if(APPLE) SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES LINK_FLAGS "-framework Carbon -framework CoreFoundation") @@ -412,13 +415,9 @@ endif() if(UNIX OR APPLE) target_link_libraries(opentrack opentrack-qxt-mini) endif() -target_link_libraries(opentrack ${OpenCV_LIBS}) +target_link_libraries(opentrack-api ${OpenCV_LIBS}) include_directories(${OpenCV_INCLUDE_DIRS}) -if(UNIX OR APPLE) - install(TARGETS opentrack-qxt-mini RUNTIME DESTINATION . LIBRARY DESTINATION . ) -endif() - link_with_dinput8(opentrack) if(CMAKE_SYSTEM STREQUAL LINUX) @@ -427,9 +426,9 @@ endif() target_link_libraries(opentrack opentrack-version opentrack-pose-widget opentrack-spline-widget ${MY_QT_LIBS} ${QXT_QXTCORE_LIB_RELEASE} ${QXT_QXTWIDGETS_LIB_RELEASE}) if(NOT WIN32) - target_link_libraries(opentrack dl) + target_link_libraries(opentrack-api dl) else() - target_link_libraries(opentrack winmm) + target_link_libraries(opentrack-api winmm) endif() # make install @@ -455,13 +454,6 @@ if(NOT WIN32 AND SDK_WINE_PREFIX AND NOT SDK_WINE_NO_WRAPPER) DESTINATION .) endif() -install(TARGETS - opentrack-compat - opentrack-csv - opentrack-pose-widget - opentrack-spline-widget - RUNTIME DESTINATION . LIBRARY DESTINATION . ) - install(TARGETS opentrack DESTINATION .) if(SDK_VJOY) diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp index 57cea7a4..ebf43a8d 100644 --- a/facetracknoir/curve-config.cpp +++ b/facetracknoir/curve-config.cpp @@ -1,6 +1,6 @@ #include "./facetracknoir.h" #include "./curve-config.h" -#include "./main-settings.hpp" +#include "opentrack/main-settings.hpp" MapWidget::MapWidget(Mappings& m, main_settings& s, QWidget *parent) : QWidget(parent, Qt::Dialog), m(m) diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h index d485c4ff..244cf6df 100644 --- a/facetracknoir/curve-config.h +++ b/facetracknoir/curve-config.h @@ -1,6 +1,6 @@ #pragma once #include <QWidget> -#include "./mappings.hpp" +#include "opentrack/mappings.hpp" #include "ui_ftnoir_curves.h" class MapWidget: public QWidget diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 37fbd214..76d7af19 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -23,74 +23,24 @@ *********************************************************************************/ #include "facetracknoir.h" #include "shortcuts.h" -#include "tracker.h" +#include "opentrack/tracker.h" #include "curve-config.h" #include <QFileDialog> -#if defined(__APPLE__) -# define SONAME "dylib" -#elif defined(_WIN32) -# define SONAME "dll" -#else -# define SONAME "so" -#endif - -#include <iostream> - -#ifdef _MSC_VER -# error "No support for MSVC anymore" -#else -# define LIB_PREFIX "lib" -#endif - -static bool get_metadata(ptr<DynamicLibrary> lib, QString& name, QIcon& icon) -{ - Metadata* meta; - if (!lib->Metadata || ((meta = lib->Metadata()), !meta)) - return false; - name = meta->name(); - icon = meta->icon(); - delete meta; - return true; -} - -static void fill_combobox(const QString& filter, QList<ptr<DynamicLibrary>>& list, QComboBox& cbx) -{ - QDir settingsDir( QCoreApplication::applicationDirPath() ); - QStringList filenames = settingsDir.entryList( QStringList() << (LIB_PREFIX + filter + SONAME), QDir::Files, QDir::Name ); - for ( int i = 0; i < filenames.size(); i++) { - QIcon icon; - QString longName; - QString str = filenames.at(i); - auto lib = std::make_shared<DynamicLibrary>(str); - qDebug() << "Loading" << str; - std::cout.flush(); - if (!get_metadata(lib, longName, icon)) - continue; - list.push_back(lib); - cbx.addItem(icon, longName); - } -} - FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr), - tracker(nullptr), -#if defined(_WIN32) - keybindingWorker(NULL), -#else - keyCenter(this), - keyToggle(this), -#endif b(bundle("opentrack-ui")), s(b), + #if defined(_WIN32) + keybindingWorker(NULL), + #else + keyCenter(this), + keyToggle(this), + #endif pose(std::vector<axis_opts*>{&s.a_x, &s.a_y, &s.a_z, &s.a_yaw, &s.a_pitch, &s.a_roll}), timUpdateHeadPose(this), - pTrackerDialog(nullptr), - pProtocolDialog(nullptr), - pFilterDialog(nullptr), - shortcuts_widget(nullptr), - mapping_widget(nullptr), kbd_quit(QKeySequence("Ctrl+Q"), this), - no_feed_pixmap(":/uielements/no-feed.png") + no_feed_pixmap(":/uielements/no-feed.png"), + module_list(dylib::enum_libraries()) { ui.setupUi(this); setFixedSize(size()); @@ -98,9 +48,7 @@ FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr), updateButtonState(false, false); QDir::setCurrent(QCoreApplication::applicationDirPath()); - - fill_profile_cbx(); - + connect(ui.btnLoad, SIGNAL(clicked()), this, SLOT(open())); connect(ui.btnSave, SIGNAL(clicked()), this, SLOT(save())); connect(ui.btnSaveAs, SIGNAL(clicked()), this, SLOT(saveAs())); @@ -111,12 +59,14 @@ FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr), connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showServerControls())); connect(ui.btnShowFilterControls, SIGNAL(clicked()), this, SLOT(showFilterControls())); - dlopen_filters.push_back(nullptr); + filter_modules.push_back(nullptr); ui.iconcomboFilter->addItem(QIcon(), ""); - - fill_combobox("opentrack-proto-*.", dlopen_protocols, *ui.iconcomboProtocol); - fill_combobox("opentrack-tracker-*.", dlopen_trackers, *ui.iconcomboTrackerSource); - fill_combobox("opentrack-filter-*.", dlopen_filters, *ui.iconcomboFilter); + + fill_combobox(dylib::Tracker, module_list, tracker_modules, ui.iconcomboTrackerSource); + fill_combobox(dylib::Protocol, module_list, protocol_modules, ui.iconcomboProtocol); + fill_combobox(dylib::Filter, module_list, filter_modules, ui.iconcomboFilter); + + fill_profile_combobox(); tie_setting(s.tracker_dll, ui.iconcomboTrackerSource); tie_setting(s.protocol_dll, ui.iconcomboProtocol); @@ -137,12 +87,24 @@ FaceTrackNoIR::FaceTrackNoIR() : QMainWindow(nullptr), kbd_quit.setEnabled(true); } -FaceTrackNoIR::~FaceTrackNoIR() { - +FaceTrackNoIR::~FaceTrackNoIR() +{ stopTracker(); save(); } +void FaceTrackNoIR::fill_combobox(dylib::Type t, QList<ptr<dylib>> list, QList<ptr<dylib>>& out_list, QComboBox* cbx) +{ + for (auto x : list) + { + if (t && t == x->type) + { + cbx->addItem(x->icon, x->name); + out_list.append(x); + } + } +} + QFrame* FaceTrackNoIR::video_frame() { return ui.video_frame; } @@ -163,7 +125,7 @@ void FaceTrackNoIR::open() { QSettings settings("opentrack"); settings.setValue ("SettingsFile", QFileInfo(fileName).absoluteFilePath()); } - fill_profile_cbx(); + fill_profile_combobox(); loadSettings(); } } @@ -219,7 +181,7 @@ void FaceTrackNoIR::saveAs() save(); } - fill_profile_cbx(); + fill_profile_combobox(); } void FaceTrackNoIR::load_mappings() { @@ -231,6 +193,24 @@ void FaceTrackNoIR::loadSettings() { load_mappings(); } +extern "C" volatile const char* opentrack_version; + +void FaceTrackNoIR::fill_profile_combobox() +{ + QSettings settings("opentrack"); + QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + + "/settings/default.ini" ).toString(); + qDebug() << "Config file now" << currentFile; + QFileInfo pathInfo ( currentFile ); + setWindowTitle(QString( const_cast<const char*>(opentrack_version) + QStringLiteral(" :: ")) + pathInfo.fileName()); + QDir settingsDir( pathInfo.dir() ); + auto iniFileList = settingsDir.entryList( QStringList { "*.ini" } , QDir::Files, QDir::Name ); + ui.iconcomboProfile->clear(); + for (auto x : iniFileList) + ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), x); + ui.iconcomboProfile->setCurrentText(pathInfo.fileName()); +} + void FaceTrackNoIR::updateButtonState(bool running, bool inertialp) { bool not_running = !running; @@ -313,6 +293,7 @@ void FaceTrackNoIR::stopTracker( ) { } tracker = nullptr; + libs = SelectedLibraries(); updateButtonState(false, false); } @@ -356,7 +337,7 @@ void FaceTrackNoIR::showHeadPose() void FaceTrackNoIR::showTrackerSettings() { - ptr<DynamicLibrary> lib = dlopen_trackers.value(ui.iconcomboTrackerSource->currentIndex(), nullptr); + ptr<dylib> lib = tracker_modules.value(ui.iconcomboTrackerSource->currentIndex(), nullptr); if (lib) { pTrackerDialog = ptr<ITrackerDialog>(reinterpret_cast<ITrackerDialog*>(lib->Dialog())); @@ -367,7 +348,7 @@ void FaceTrackNoIR::showTrackerSettings() } void FaceTrackNoIR::showServerControls() { - ptr<DynamicLibrary> lib = dlopen_protocols.value(ui.iconcomboProtocol->currentIndex(), nullptr); + ptr<dylib> lib = protocol_modules.value(ui.iconcomboProtocol->currentIndex(), nullptr); if (lib) { pProtocolDialog = ptr<IProtocolDialog>(reinterpret_cast<IProtocolDialog*>(lib->Dialog())); @@ -377,7 +358,7 @@ void FaceTrackNoIR::showServerControls() { } void FaceTrackNoIR::showFilterControls() { - ptr<DynamicLibrary> lib = dlopen_filters.value(ui.iconcomboFilter->currentIndex(), nullptr); + ptr<dylib> lib = filter_modules.value(ui.iconcomboFilter->currentIndex(), nullptr); if (lib) { pFilterDialog = ptr<IFilterDialog>(reinterpret_cast<IFilterDialog*>(lib->Dialog())); @@ -403,23 +384,6 @@ void FaceTrackNoIR::exit() { extern "C" volatile const char* opentrack_version; -void FaceTrackNoIR::fill_profile_cbx() -{ - QSettings settings("opentrack"); - QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString(); - qDebug() << "Config file now" << currentFile; - QFileInfo pathInfo ( currentFile ); - setWindowTitle(QString( const_cast<const char*>(opentrack_version) + QStringLiteral(" :: ")) + pathInfo.fileName()); - QDir settingsDir( pathInfo.dir() ); - QStringList filters; - filters << "*.ini"; - auto iniFileList = settingsDir.entryList( filters, QDir::Files, QDir::Name ); - ui.iconcomboProfile->clear(); - for ( int i = 0; i < iniFileList.size(); i++) - ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), iniFileList.at(i)); - ui.iconcomboProfile->setCurrentText(pathInfo.fileName()); -} - void FaceTrackNoIR::profileSelected(int index) { QSettings settings("opentrack"); diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index fd5ccebb..0c5d902f 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -44,10 +44,10 @@ #include "ui_facetracknoir.h" -#include "./options.h" -#include "./main-settings.hpp" -#include "./plugin-support.h" -#include "./tracker.h" +#include "opentrack/options.hpp" +#include "opentrack/main-settings.hpp" +#include "opentrack/plugin-support.h" +#include "opentrack/tracker.h" #include "./shortcuts.h" #include "./curve-config.h" @@ -56,27 +56,16 @@ using namespace options; class FaceTrackNoIR : public QMainWindow { Q_OBJECT - public: - FaceTrackNoIR(); - ~FaceTrackNoIR(); - - QFrame *video_frame(); + pbundle b; + main_settings s; ptr<Tracker> tracker; - void bindKeyboardShortcuts(); - - // XXX this shit stinks -sh 20141004 - // TODO move to separate class representing running tracker state - ptr<DynamicLibrary> current_tracker() { - return dlopen_trackers.value(ui.iconcomboTrackerSource->currentIndex(), nullptr); - } - ptr<DynamicLibrary> current_protocol() { - return dlopen_protocols.value(ui.iconcomboProtocol->currentIndex(), nullptr); - } - ptr<DynamicLibrary> current_filter() { - return dlopen_filters.value(ui.iconcomboFilter->currentIndex(), nullptr); - } - + + // XXX move kbd handling into class its own -sh 20141019 +#ifndef _WIN32 + void bind_keyboard_shortcut(QxtGlobalShortcut&, key_opts& k); +#endif +private: #if defined(_WIN32) Key keyCenter; Key keyToggle; @@ -85,12 +74,6 @@ public: QxtGlobalShortcut keyCenter; QxtGlobalShortcut keyToggle; #endif - pbundle b; - main_settings s; -public slots: - void shortcutRecentered(); - void shortcutToggled(); -private: // XXX move the shit outta the _widget_, establish a class // for running tracker state, etc -sh 20141014 Mappings pose; @@ -104,23 +87,42 @@ private: ptr<QWidget> shortcuts_widget; ptr<MapWidget> mapping_widget; + + QShortcut kbd_quit; + QPixmap no_feed_pixmap; + + QList<ptr<dylib>> filter_modules; + QList<ptr<dylib>> tracker_modules; + QList<ptr<dylib>> protocol_modules; + + QList<ptr<dylib>> module_list; + + // XXX this shit stinks -sh 20141004 + // TODO move to separate class representing running tracker state + ptr<dylib> current_tracker() + { + return tracker_modules.value(ui.iconcomboTrackerSource->currentIndex(), nullptr); + } + ptr<dylib> current_protocol() + { + return protocol_modules.value(ui.iconcomboProtocol->currentIndex(), nullptr); + } + ptr<dylib> current_filter() + { + return filter_modules.value(ui.iconcomboFilter->currentIndex(), nullptr); + } void createIconGroupBox(); void loadSettings(); void updateButtonState(bool running, bool inertialp); - QList<ptr<DynamicLibrary>> dlopen_filters; - QList<ptr<DynamicLibrary>> dlopen_trackers; - QList<ptr<DynamicLibrary>> dlopen_protocols; - - QShortcut kbd_quit; - QPixmap no_feed_pixmap; + void fill_combobox(dylib::Type t, QList<ptr<dylib>> list, QList<ptr<dylib> > &out_list, QComboBox* cbx); + void fill_profile_combobox(); -#ifndef _WIN32 - void bind_keyboard_shortcut(QxtGlobalShortcut&, key_opts& k); -#endif - void fill_profile_cbx(); - + QFrame *video_frame(); +public slots: + void shortcutRecentered(); + void shortcutToggled(); private slots: void open(); void save(); @@ -139,8 +141,10 @@ private slots: void startTracker(); void stopTracker(); - public: + FaceTrackNoIR(); + ~FaceTrackNoIR(); void save_mappings(); void load_mappings(); + void bindKeyboardShortcuts(); }; diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index f6ffd68c..37bd8891 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -9,7 +9,7 @@ #include <cmath> #include <QDebug> #include <QMutexLocker> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" using namespace std; FTNoIR_Filter::FTNoIR_Filter() : first_run(true) diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h index c1b325fa..ec78dd4f 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.h +++ b/ftnoir_filter_accela/ftnoir_filter_accela.h @@ -1,6 +1,6 @@ #pragma once #include "ui_ftnoir_accela_filtercontrols.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <QMutex> #define ACCELA_SMOOTHING_ROTATION 60.0 @@ -8,7 +8,7 @@ #define ACCELA_SECOND_ORDER_ALPHA 100.0 #define ACCELA_THIRD_ORDER_ALPHA 180.0 -#include <facetracknoir/options.h> +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index 1520ad6e..69348a7f 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -3,7 +3,7 @@ #include <QDebug> #include <algorithm> #include <QDoubleSpinBox> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FilterControls::FilterControls() : accela_filter(nullptr) diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp index 65bee314..ff29227e 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_filter_accela.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp index 5214b37b..b25fc50b 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp @@ -8,7 +8,7 @@ #include <cmath> #include <QDebug> #include <QWidget> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <algorithm> #include <QMutexLocker> diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h index f2baaa22..ff8c40a9 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h @@ -1,10 +1,10 @@ #pragma once -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include "ui_ftnoir_ewma_filtercontrols.h" #include <QWidget> #include <QMutex> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp index bdc6e1bf..462cca3f 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp @@ -1,7 +1,7 @@ #include "ftnoir_filter_ewma2.h" #include <cmath> #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include "ui_ftnoir_ewma_filtercontrols.h" FilterControls::FilterControls() : pFilter(NULL) diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp index 5ec6138a..999dcd6f 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_filter_ewma2.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_filter_kalman/ftnoir_filter_kalman.h b/ftnoir_filter_kalman/ftnoir_filter_kalman.h index 7dcd0f7d..bb1c2b98 100755 --- a/ftnoir_filter_kalman/ftnoir_filter_kalman.h +++ b/ftnoir_filter_kalman/ftnoir_filter_kalman.h @@ -9,14 +9,14 @@ #define INCLUDED_FTN_FILTER_H #include "ui_ftnoir_kalman_filtercontrols.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <opencv2/core/core.hpp> #include <opencv2/video/video.hpp> #include <vector> #include <QString> #include <QElapsedTimer> #include <QWidget> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; class OPENTRACK_EXPORT FTNoIR_Filter : public IFilter diff --git a/ftnoir_filter_kalman/kalman.cpp b/ftnoir_filter_kalman/kalman.cpp index 9a902643..ab352faa 100644 --- a/ftnoir_filter_kalman/kalman.cpp +++ b/ftnoir_filter_kalman/kalman.cpp @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ #include "ftnoir_filter_kalman.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <QDebug> #include <cmath> diff --git a/ftnoir_posewidget/glwidget.h b/ftnoir_posewidget/glwidget.h index 91536336..243e3773 100644 --- a/ftnoir_posewidget/glwidget.h +++ b/ftnoir_posewidget/glwidget.h @@ -9,7 +9,7 @@ #include <QtGui> #include <QPixmap> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" struct Point { Point(int x, int y) : diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp index 8b5baaa8..b3243f62 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp @@ -26,7 +26,7 @@ * It is based on the (Linux) example made by Melchior FRANZ. * ********************************************************************************/ #include "ftnoir_protocol_fg.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" // For Todd and Arda Kutlu diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h index 44b79c06..d35b9fbd 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h @@ -31,8 +31,8 @@ #include <QThread> #include <QUdpSocket> #include <QMessageBox> -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp index 0074a64a..041e9961 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp @@ -28,7 +28,7 @@ #include "ftnoir_protocol_fg.h" #include <QObject> #include <QFile> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" //******************************************************************************************************* // FaceTrackNoIR Client Settings-dialog. diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp index f830f8f7..aaaa1d63 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp @@ -24,7 +24,7 @@ ********************************************************************************/ #include "ftnoir_protocol_fg.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp index 16f116f6..20a39fbc 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp @@ -25,7 +25,7 @@ * to games, using the FSUIPC.dll. * ********************************************************************************/ #include "ftnoir_protocol_fsuipc.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FTNoIR_Protocol::FTNoIR_Protocol() { diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h index 06428df3..006c93de 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h @@ -31,7 +31,7 @@ #include <windows.h> #include <stdlib.h> #include "FSUIPC_User.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include "ui_ftnoir_fsuipccontrols.h" #include <QMessageBox> #include <QSettings> @@ -40,7 +40,7 @@ #include <QDebug> #include <QFile> #include <QFileDialog> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; #define FSUIPC_FILENAME "C:\\Program Files\\Microsoft Games\\Flight Simulator 9\\Modules\\FSUIPC.dll" diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp index f73d65bd..d38eae71 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_fsuipc.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FSUIPCControls::FSUIPCControls() { diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp index dbea2c46..19ecf351 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_fsuipc.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata(void) { diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index 51079f20..06992de5 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -26,7 +26,7 @@ ********************************************************************************/ #pragma once #include "ui_ftnoir_ftcontrols.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <QMessageBox> #include <QSettings> #include <QLibrary> @@ -37,7 +37,7 @@ #include <QMutex> #include <QMutexLocker> #include "compat/compat.h" -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" #include "fttypes.h" using namespace options; diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp index d7a13fa5..13506022 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft_dll.cpp @@ -1,4 +1,4 @@ -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include "ftnoir_protocol_ft/ftnoir_protocol_ft.h" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp index c8759bc1..f5911b2a 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp @@ -27,7 +27,7 @@ ********************************************************************************/ #include "ftnoir_protocol_ftn.h" #include <QFile> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FTNoIR_Protocol::FTNoIR_Protocol() { diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h index 587f0034..c9b7ace6 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h @@ -32,8 +32,8 @@ #include <QUdpSocket> #include <QMessageBox> #include <cmath> -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp index 4637223d..8104a9de 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_ftn.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FTNControls::FTNControls() { diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp index 0d24ccf8..d1fa3e33 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dll.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_ftn.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp index 8b7db62a..f0479e0d 100644 --- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp +++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_libevdev.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <cstdio> #include <algorithm> diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h index af6b3142..9ea9664e 100644 --- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h +++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.h @@ -8,7 +8,7 @@ #include "ui_ftnoir_libevdev_controls.h" #include <QMessageBox> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" extern "C" { # include <libevdev/libevdev.h> diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp index 15e8097c..68a4610a 100644 --- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp +++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_libevdev.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" LibevdevControls::LibevdevControls() { diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp index 75898715..9a16ea52 100644 --- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp +++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp @@ -1,6 +1,6 @@ #include "ftnoir_protocol_libevdev.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp index ca3ba805..ac543812 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp @@ -27,7 +27,7 @@ * but no face-tracking. * ********************************************************************************/ #include "ftnoir_protocol_mouse.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" void FTNoIR_Protocol::pose(const double *headpose ) { double fMouse_X = 0; diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h index 55a37e12..3d04fa15 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h @@ -39,8 +39,8 @@ #include <QFile> #include <windows.h> #include <winuser.h> -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp index efac958c..3303e54c 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_mouse.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" MOUSEControls::MOUSEControls() : _proto(nullptr) { diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp index 39bdf6e5..7bc2b85c 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ #include "ftnoir_protocol_mouse.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index b56585df..36764edc 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -27,7 +27,7 @@ * must be treated as such... * ********************************************************************************/ #include "ftnoir_protocol_sc.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" importSimConnect_CameraSetRelative6DOF FTNoIR_Protocol::simconnect_set6DOF; HANDLE FTNoIR_Protocol::hSimConnect = 0; // Handle to SimConnect diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h index 784c915c..39544aab 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h @@ -29,7 +29,7 @@ #pragma once #undef _WIN32_WINNT #define _WIN32_WINNT 0x0502 -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" // // Prevent the SimConnect manifest from being merged in the application-manifest // This is necessary to run FaceTrackNoIR on a PC without FSX @@ -45,7 +45,7 @@ #include <QProcess> #include <QDebug> #include <QFile> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; typedef HRESULT (WINAPI *importSimConnect_Open)(HANDLE * phSimConnect, LPCSTR szName, HWND hWnd, DWORD UserEventWin32, HANDLE hEventHandle, DWORD ConfigIndex); diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp index 090a6174..30f7d460 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp @@ -24,7 +24,7 @@ ********************************************************************************/ #include "ftnoir_protocol_sc.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" SCControls::SCControls() { diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp index 9bdbef09..937ffe0c 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp @@ -24,7 +24,7 @@ ********************************************************************************/ #include "ftnoir_protocol_sc.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp index c29eb11e..b636ffd4 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_vjoy.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" FTNoIR_Protocol::FTNoIR_Protocol() { diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h index e9a6e704..73496fba 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h @@ -28,7 +28,7 @@ #pragma once #include "ui_ftnoir_vjoy_controls.h" #include <cmath> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #define FT_PROGRAMID "FT_ProgramID" diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp index 34ee29e9..8da3ccfd 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_vjoy.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" VJoyControls::VJoyControls() { diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp index cdfdc361..fc30921d 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp @@ -1,6 +1,6 @@ #include "ftnoir_protocol_vjoy.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h index 685c3010..528c4dd3 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h @@ -8,7 +8,7 @@ #include <QMutex> #include <QMutexLocker> #include <QFile> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include "compat/compat.h" #include "ftnoir_protocol_wine/wine-shm.h" diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp index 4e3d72ac..81fc9560 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp @@ -1,6 +1,6 @@ #include "ftnoir_protocol_wine.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FTControls::FTControls() { diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp index df26e49f..92faaa94 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_protocol_wine.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index 066b782a..bd7e3ff4 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -12,7 +12,7 @@ #include <QMutexLocker> #include "./include/markerdetector.h" #include "ftnoir_tracker_aruco.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <opencv2/core/core.hpp> #include <opencv2/highgui/highgui.hpp> diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h index 67392d40..ad139145 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h @@ -15,9 +15,9 @@ #include <QHBoxLayout> #include <QDialog> #include <QTimer> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" #include "ftnoir_tracker_aruco/trans_calib.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <opencv2/core/core.hpp> #include <opencv2/highgui/highgui.hpp> diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h index 66e57100..ffcd3eca 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" //----------------------------------------------------------------------------- class TrackerDll : public Metadata diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp index 0870e67d..eff1103b 100644 --- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp +++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_freepie-udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <cinttypes> #include <algorithm> diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h index 92d42319..0cec952f 100644 --- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h +++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.h @@ -9,8 +9,8 @@ #include <QUdpSocket> #include <QThread> #include "ui_freepie-udp-controls.h" -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp index 6d6a951e..ec95da90 100644 --- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp +++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_freepie-udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" TrackerDialog::TrackerDialog() { diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp index 3c7fce9a..5b08f040 100644 --- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp +++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_freepie-udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp index 13b6aabb..537d3cf6 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp @@ -3,7 +3,7 @@ #include "ftnoir_tracker_ht.h" #include "ftnoir_tracker_ht_dll.h" #include "ui_ht-trackercontrols.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include <cmath> #if defined(_WIN32) diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h index 119ffa7d..6a19477e 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h @@ -14,8 +14,8 @@ #include "ht_video_widget.h" #include "compat/compat.h" #include <QObject> -#include "facetracknoir/options.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/options.hpp" +#include "opentrack/plugin-api.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h b/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h index d684f72f..853d3181 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h @@ -1,4 +1,4 @@ -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" class TrackerDll : public Metadata { diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp index b7f088e9..34c27579 100644 --- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp +++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp @@ -1,6 +1,6 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_hydra.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <cstdio> #ifdef _WIN32 # define SIXENSE_STATIC_LIB diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h index a498a1cb..87d572d7 100644 --- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h +++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h @@ -1,6 +1,6 @@ #include "ui_ftnoir_hydra_clientcontrols.h" -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp index 3d3be4ab..83b48a8e 100644 --- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp +++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_hydra.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp index 871312d1..1faa1578 100644 --- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp +++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.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 <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp index 97f36b67..352448a3 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_joystick.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <QMutexLocker> FTNoIR_Tracker::FTNoIR_Tracker() : diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h index 03bcc383..6d42f3e1 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h @@ -15,7 +15,7 @@ #include <QMutex> #include <QFrame> #include <cmath> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 #endif @@ -26,7 +26,7 @@ #include <oleauto.h> #include <shellapi.h> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp index 84e02fb0..bb95dd92 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_joystick.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext ) { diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp index c2328a90..0dca6c9b 100644 --- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp +++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_joystick.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.cpp b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.cpp index 8be6a589..6557eada 100644 --- a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.cpp +++ b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_libevdev.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <algorithm> diff --git a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.h b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.h index 4251435c..0ae1c8b3 100644 --- a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.h +++ b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev.h @@ -1,8 +1,8 @@ #pragma once #include <cmath> #include "libevdev/libevdev.h" -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" #include "./ui_ftnoir_libevdev.h" #include <QThread> #include <QMutex> diff --git a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dialog.cpp b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dialog.cpp index e0126283..02f48639 100644 --- a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dialog.cpp +++ b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_libevdev.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include <QDir> diff --git a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dll.cpp b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dll.cpp index e6216d7f..26c858b9 100644 --- a/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dll.cpp +++ b/ftnoir_tracker_libevdev/ftnoir_tracker_libevdev_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_libevdev.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h index 4295b6f9..921d61cf 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h @@ -9,14 +9,14 @@ #define FTNOIR_TRACKER_PT_H #ifdef OPENTRACK_API -# include "facetracknoir/plugin-api.hpp" +# include "opentrack/plugin-api.hpp" #endif #include "ftnoir_tracker_pt_settings.h" #include "camera.h" #include "point_extractor.h" #include "point_tracker.h" #include "pt_video_widget.h" -#include "facetracknoir/timer.hpp" +#include "opentrack/timer.hpp" #include <QThread> #include <QMutex> diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h index 8b6309da..7f634c04 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h @@ -9,7 +9,7 @@ #define FTNOIR_TRACKER_PT_DIALOG_H #ifdef OPENTRACK_API -# include "facetracknoir/plugin-api.hpp" +# include "opentrack/plugin-api.hpp" #else #include "..\ftnoir_tracker_base\ftnoir_tracker_base.h" #endif diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp index 9b73ee37..1aaa1bf9 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp @@ -9,7 +9,7 @@ #include <QIcon> #ifdef OPENTRACK_API -# include "facetracknoir/plugin-support.h" +# include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() #else # pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0") diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h index d9b9adf6..9579d46c 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h @@ -6,7 +6,7 @@ */ #if defined(OPENTRACK_API) -# include "facetracknoir/plugin-api.hpp" +# include "opentrack/plugin-api.hpp" #else # include "../ftnoir_tracker_base/ftnoir_tracker_base.h" #endif diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h index e8cac679..9365eb9a 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h @@ -11,7 +11,7 @@ #include <opencv2/core/core.hpp> #include "point_tracker.h" -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; struct settings diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp index 9f44c78e..724c7d3d 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp @@ -1,6 +1,6 @@ /* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */ #include "ftnoir_tracker_rift.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" #include "OVR_CAPI.h" #include "Kernel/OVR_Math.h" #include <cstdio> diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index db14a536..179125f8 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -3,10 +3,10 @@ #include <QMessageBox> #include <QWaitCondition> #include <cmath> -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" #include "OVR.h" #include <memory> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp index 2c0a1506..2439890b 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_rift.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp index fd50f75f..2809ef29 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.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.h" #include <QDebug> -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp index cbea79a4..507543be 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" FTNoIR_Tracker::FTNoIR_Tracker() : last_recv_pose { 0,0,0, 0,0,0 }, should_quit(false) {} diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h index 1ec63866..96f07177 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h @@ -3,8 +3,8 @@ #include <QUdpSocket> #include <QThread> #include <cmath> -#include "facetracknoir/plugin-api.hpp" -#include "facetracknoir/options.h" +#include "opentrack/plugin-api.hpp" +#include "opentrack/options.hpp" using namespace options; struct settings { diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp index 0b4dd74e..eb5abcd8 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" TrackerControls::TrackerControls() { diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp index d6cb5db3..e2b10455 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp @@ -1,5 +1,5 @@ #include "ftnoir_tracker_udp.h" -#include "facetracknoir/plugin-support.h" +#include "opentrack/plugin-api.hpp" extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() { diff --git a/facetracknoir/export.hpp b/opentrack/export.hpp index 8c8bdc69..8c8bdc69 100644 --- a/facetracknoir/export.hpp +++ b/opentrack/export.hpp diff --git a/facetracknoir/main-settings.hpp b/opentrack/main-settings.hpp index 0a1fb968..6f78ac82 100644 --- a/facetracknoir/main-settings.hpp +++ b/opentrack/main-settings.hpp @@ -1,7 +1,7 @@ #pragma once #include <QString> -#include "facetracknoir/options.h" +#include "opentrack/options.hpp" using namespace options; struct key_opts { diff --git a/facetracknoir/mappings.hpp b/opentrack/mappings.hpp index 5953ed1e..86126db9 100644 --- a/facetracknoir/mappings.hpp +++ b/opentrack/mappings.hpp @@ -1,7 +1,7 @@ #pragma once #include <QSettings> -#include "options.h" +#include "options.hpp" using namespace options; #include "../qfunctionconfigurator/functionconfig.h" #include "main-settings.hpp" diff --git a/facetracknoir/options.h b/opentrack/options.hpp index 9f14b62a..6c15d729 100644 --- a/facetracknoir/options.h +++ b/opentrack/options.hpp @@ -130,7 +130,6 @@ namespace options { }; class impl_bundle : public QObject { - Q_OBJECT protected: QMutex mtx; const string group_name; @@ -214,8 +213,8 @@ namespace options { static opt_singleton<k, v>& datum() { - static opt_singleton<k, v> ret; - return ret; + static auto ret = std::make_shared<opt_singleton<k, v>>(); + return *ret; } pbundle bundle(const k& key) @@ -263,32 +262,33 @@ namespace options { } }; - class base_value : public QObject { + class base_value : public QObject + { Q_OBJECT #define DEFINE_SLOT(t) void setValue(t datum) { store(datum); } -#define DEFINE_SIGNAL(t) void valueChanged(const t&) +#define DEFINE_SIGNAL(t) void valueChanged(t) public: base_value(pbundle b, const string& name) : b(b), self_name(name) {} + signals: + DEFINE_SIGNAL(double); + DEFINE_SIGNAL(int); + DEFINE_SIGNAL(bool); + DEFINE_SIGNAL(QString); protected: pbundle b; string self_name; - + template<typename t> void store(const t& datum) { if (b->store_kv(self_name, datum)) - emit valueChanged(datum); + emit valueChanged(static_cast<t>(datum)); } public slots: DEFINE_SLOT(double) DEFINE_SLOT(int) DEFINE_SLOT(QString) DEFINE_SLOT(bool) - signals: - DEFINE_SIGNAL(double); - DEFINE_SIGNAL(int); - DEFINE_SIGNAL(bool); - DEFINE_SIGNAL(QString); }; static inline string string_from_qstring(const QString& datum) diff --git a/facetracknoir/plugin-api.hpp b/opentrack/plugin-api.hpp index f352a6a9..a8996d63 100644 --- a/facetracknoir/plugin-api.hpp +++ b/opentrack/plugin-api.hpp @@ -1,11 +1,11 @@ #pragma once -#include "facetracknoir/export.hpp" +#include "export.hpp" enum Axis { TX = 0, TY, TZ, Yaw, Pitch, Roll }; #ifndef OPENTRACK_CROSS_ONLY -# include "facetracknoir/plugin-qt-api.hpp" +# include "plugin-qt-api.hpp" #endif
\ No newline at end of file diff --git a/facetracknoir/plugin-qt-api.hpp b/opentrack/plugin-qt-api.hpp index a2aa0d19..a2aa0d19 100644 --- a/facetracknoir/plugin-qt-api.hpp +++ b/opentrack/plugin-qt-api.hpp diff --git a/facetracknoir/plugin-support.cpp b/opentrack/plugin-support.cpp index b202fc74..694f3e19 100644 --- a/facetracknoir/plugin-support.cpp +++ b/opentrack/plugin-support.cpp @@ -3,6 +3,7 @@ #include "plugin-support.h" #include <QCoreApplication> #include <QFile> +#include <QDir> #ifndef _WIN32 # include <dlfcn.h> @@ -13,7 +14,7 @@ SelectedLibraries::~SelectedLibraries() } template<typename t> -static ptr<t> make_instance(ptr<DynamicLibrary> lib) +static ptr<t> make_instance(ptr<dylib> lib) { ptr<t> ret = nullptr; if (lib && lib->Constructor) @@ -22,7 +23,7 @@ static ptr<t> make_instance(ptr<DynamicLibrary> lib) return ret; } -SelectedLibraries::SelectedLibraries(QFrame* frame, dylib t, dylib p, dylib f) : +SelectedLibraries::SelectedLibraries(QFrame* frame, dylibtr t, dylibtr p, dylibtr f) : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), @@ -50,10 +51,74 @@ SelectedLibraries::SelectedLibraries(QFrame* frame, dylib t, dylib p, dylib f) : correct = true; } -DynamicLibrary::DynamicLibrary(const QString& filename) : +#if defined(__APPLE__) +# define SONAME "dylib" +#elif defined(_WIN32) +# define SONAME "dll" +#else +# define SONAME "so" +#endif + +#include <iostream> + +#ifdef _MSC_VER +# error "No support for MSVC anymore" +#else +# define LIB_PREFIX "lib" +#endif + +static bool get_metadata(ptr<dylib> lib, QString& name, QIcon& icon) +{ + Metadata* meta; + if (!lib->Meta || ((meta = lib->Meta()), !meta)) + return false; + name = meta->name(); + icon = meta->icon(); + delete meta; + return true; +} + +QList<ptr<dylib>> dylib::enum_libraries() +{ +#define BASE "opentrack-" +#define SUFF "-*.*" + const char* filters_n[] = { BASE "filter" SUFF, + BASE "tracker" SUFF, + BASE "proto" SUFF }; + const Type filters_t[] = { Filter, Tracker, Protocol }; + + QDir settingsDir( QCoreApplication::applicationDirPath() ); + + QList<ptr<dylib>> ret; + + for (int i = 0; i < 3; i++) + { + QString filter = filters_n[i]; + auto t = filters_t[i]; + QStringList filenames = settingsDir.entryList(QStringList { LIB_PREFIX + filter + SONAME }, + QDir::Files, + QDir::Name); + for ( int i = 0; i < filenames.size(); i++) { + QIcon icon; + QString longName; + QString str = filenames.at(i); + auto lib = std::make_shared<dylib>(str, t); + qDebug() << "Loading" << str; + std::cout.flush(); + if (!get_metadata(lib, longName, icon)) + continue; + ret.push_back(lib); + } + } + + return ret; +} + +dylib::dylib(const QString& filename, Type t) : + type(t), Dialog(nullptr), Constructor(nullptr), - Metadata(nullptr) + Meta(nullptr) { this->filename = filename; #if defined(_WIN32) @@ -84,8 +149,8 @@ DynamicLibrary::DynamicLibrary(const QString& filename) : if (_foo::die(handle, !Constructor)) return; - Metadata = (METADATA_FUNPTR) handle->resolve("GetMetadata"); - if (_foo::die(handle, !Metadata)) + Meta = (METADATA_FUNPTR) handle->resolve("GetMetadata"); + if (_foo::die(handle, !Meta)) return; #else QByteArray latin1 = QFile::encodeName(filename); @@ -125,16 +190,21 @@ DynamicLibrary::DynamicLibrary(const QString& filename) : Constructor = (CTOR_FUNPTR) dlsym(handle, "GetConstructor"); if (_foo::err(handle)) return; - Metadata = (METADATA_FUNPTR) dlsym(handle, "GetMetadata"); + Meta = (METADATA_FUNPTR) dlsym(handle, "GetMetadata"); if (_foo::err(handle)) return; } else { (void) _foo::err(handle); } #endif + + auto m = ptr<Metadata>(Meta()); + + icon = m->icon(); + name = m->name(); } -DynamicLibrary::~DynamicLibrary() +dylib::~dylib() { #if defined(_WIN32) handle->unload(); diff --git a/facetracknoir/plugin-support.h b/opentrack/plugin-support.h index 83856922..238aeb53 100644 --- a/facetracknoir/plugin-support.h +++ b/opentrack/plugin-support.h @@ -1,12 +1,13 @@ #pragma once -#include "facetracknoir/plugin-api.hpp" +#include "plugin-api.hpp" #include <QWidget> #include <QDebug> #include <QString> #include <QLibrary> #include <QFrame> +#include <QList> #include <memory> template<typename t> using ptr = std::shared_ptr<t>; @@ -14,14 +15,22 @@ template<typename t> using ptr = std::shared_ptr<t>; extern "C" typedef void* (*CTOR_FUNPTR)(void); extern "C" typedef Metadata* (*METADATA_FUNPTR)(void); -class DynamicLibrary { -public: - DynamicLibrary(const QString& filename); - ~DynamicLibrary(); +struct dylib { + enum Type { Filter, Tracker, Protocol }; + + dylib(const QString& filename, Type t); + ~dylib(); + static QList<ptr<dylib>> enum_libraries(); + + Type type; + QString filename; + + QIcon icon; + QString name; + CTOR_FUNPTR Dialog; CTOR_FUNPTR Constructor; - METADATA_FUNPTR Metadata; - QString filename; + METADATA_FUNPTR Meta; private: #if defined(_WIN32) QLibrary* handle; @@ -31,12 +40,11 @@ private: }; struct SelectedLibraries { - using dylib = ptr<DynamicLibrary>; - + using dylibtr = ptr<dylib>; ptr<ITracker> pTracker; ptr<IFilter> pFilter; ptr<IProtocol> pProtocol; - SelectedLibraries(QFrame* frame, dylib t, dylib p, dylib f); + SelectedLibraries(QFrame* frame, dylibtr t, dylibtr p, dylibtr f); SelectedLibraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {} ~SelectedLibraries(); bool correct; diff --git a/facetracknoir/pose.hpp b/opentrack/pose.hpp index 41e984f5..41e984f5 100644 --- a/facetracknoir/pose.hpp +++ b/opentrack/pose.hpp diff --git a/facetracknoir/qcopyable-mutex.hpp b/opentrack/qcopyable-mutex.hpp index f7f36f93..f7f36f93 100644 --- a/facetracknoir/qcopyable-mutex.hpp +++ b/opentrack/qcopyable-mutex.hpp diff --git a/facetracknoir/quat.hpp b/opentrack/quat.hpp index 6d777b28..6d777b28 100644 --- a/facetracknoir/quat.hpp +++ b/opentrack/quat.hpp diff --git a/facetracknoir/timer.hpp b/opentrack/timer.hpp index 628365c9..628365c9 100644 --- a/facetracknoir/timer.hpp +++ b/opentrack/timer.hpp diff --git a/facetracknoir/tracker.cpp b/opentrack/tracker.cpp index 41db7c19..41db7c19 100644 --- a/facetracknoir/tracker.cpp +++ b/opentrack/tracker.cpp diff --git a/facetracknoir/tracker.h b/opentrack/tracker.h index 75f54084..02d6bee2 100644 --- a/facetracknoir/tracker.h +++ b/opentrack/tracker.h @@ -10,7 +10,7 @@ #include "../qfunctionconfigurator/functionconfig.h" #include "./main-settings.hpp" -#include "./options.h" +#include "./options.hpp" #include <QMutex> #include <QThread> @@ -35,7 +35,6 @@ private: void logic(); static void t_compensate(const double* input, double* output, bool rz); -protected: void run() override; public: Tracker(main_settings& s, Mappings& m, SelectedLibraries& libs); diff --git a/qfunctionconfigurator/functionconfig.h b/qfunctionconfigurator/functionconfig.h index e24f54cf..9edfd51c 100644 --- a/qfunctionconfigurator/functionconfig.h +++ b/qfunctionconfigurator/functionconfig.h @@ -14,8 +14,8 @@ #include <QSettings> #include <QMutex> #include <vector> -#include "../facetracknoir/plugin-api.hpp" -#include "../facetracknoir/qcopyable-mutex.hpp" +#include "../opentrack/plugin-api.hpp" +#include "../opentrack/qcopyable-mutex.hpp" class OPENTRACK_EXPORT Map { diff --git a/qfunctionconfigurator/qfunctionconfigurator.h b/qfunctionconfigurator/qfunctionconfigurator.h index 229d9977..974d9bb6 100644 --- a/qfunctionconfigurator/qfunctionconfigurator.h +++ b/qfunctionconfigurator/qfunctionconfigurator.h @@ -14,7 +14,7 @@ #include <QPointF> #include <QElapsedTimer> #include "qfunctionconfigurator/functionconfig.h" -#include "facetracknoir/plugin-api.hpp" +#include "opentrack/plugin-api.hpp" class OPENTRACK_EXPORT QFunctionConfigurator : public QWidget { |