From f7aa064edc20eafbc738271c5b53238fa4ad8361 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 6 Jun 2013 08:11:28 +0200 Subject: Remove dead code --- facetracknoir/global-settings.cpp | 6 --- facetracknoir/tracker.cpp | 4 -- ftnoir_filter_accela/ftnoir_filter_accela.cpp | 4 -- ftnoir_filter_accela/ftnoir_filter_accela.h | 4 -- .../ftnoir_filter_accela_dialog.cpp | 8 ---- ftnoir_filter_base/ftnoir_filter_base.h | 1 - ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp | 7 ---- ftnoir_filter_ewma2/ftnoir_filter_ewma2.h | 15 ++------ ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp | 8 ---- ftnoir_protocol_base/ftnoir_protocol_base.h | 1 - ftnoir_protocol_fg/ftnoir_protocol_fg.cpp | 11 ------ ftnoir_protocol_fg/ftnoir_protocol_fg.h | 4 -- ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp | 11 ------ ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h | 6 --- .../ftnoir_protocol_fsuipc_dialog.cpp | 5 --- ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 5 --- ftnoir_protocol_ft/ftnoir_protocol_ft.h | 8 +--- ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp | 5 --- ftnoir_protocol_ftn/ftnoir_protocol_ftn.h | 5 --- ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp | 5 --- ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp | 19 --------- ftnoir_protocol_mouse/ftnoir_protocol_mouse.h | 6 --- .../ftnoir_protocol_mouse_dialog.cpp | 5 --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 45 ---------------------- ftnoir_protocol_sc/ftnoir_protocol_sc.h | 3 -- ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp | 5 --- ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp | 4 -- ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h | 3 -- .../ftnoir_tracker_hillcrest.h | 3 -- .../ftnoir_tracker_hillcrest_dll.cpp | 4 -- ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | 10 ++--- ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h | 2 - ftnoir_tracker_rift/ftnoir_tracker_rift.h | 3 -- ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp | 5 --- ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp | 6 --- ftnoir_tracker_udp/ftnoir_tracker_udp.h | 2 - ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp | 13 ++----- 37 files changed, 14 insertions(+), 247 deletions(-) diff --git a/facetracknoir/global-settings.cpp b/facetracknoir/global-settings.cpp index be7fd7a7..2ab08a9d 100644 --- a/facetracknoir/global-settings.cpp +++ b/facetracknoir/global-settings.cpp @@ -85,12 +85,6 @@ SelectedLibraries::SelectedLibraries(IDynamicLibraryProvider* mainApp) : pSecondTracker->StartTracker( mainApp->get_video_widget() ); } - if (pFilter) - pFilter->Initialize(); - - if (pProtocol) - pProtocol->Initialize(); - correct = true; } diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp index 03c521c6..380d1748 100644 --- a/facetracknoir/tracker.cpp +++ b/facetracknoir/tracker.cpp @@ -156,10 +156,6 @@ void Tracker::run() { Tracker::do_center = false; - // for kalman - if (Libraries->pFilter) - Libraries->pFilter->Initialize(); - if (Libraries->pTracker) Libraries->pTracker->NotifyCenter(); diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index 87df1ba7..3c845899 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -34,10 +34,6 @@ FTNoIR_Filter::~FTNoIR_Filter() } -void FTNoIR_Filter::Initialize() -{ -} - void FTNoIR_Filter::loadSettings() { QSettings settings("opentrack"); // Registry settings (in HK_USER) diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h index bcb15330..7939b783 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.h +++ b/ftnoir_filter_accela/ftnoir_filter_accela.h @@ -47,8 +47,6 @@ class FTNOIR_FILTER_BASE_EXPORT FTNoIR_Filter : public IFilter public: FTNoIR_Filter(); ~FTNoIR_Filter(); - - void Initialize(); void FilterHeadPoseData(double *current_camera_position, double *target_camera_position, double *new_camera_position, double *last_post_filter_values); private: @@ -78,8 +76,6 @@ public: explicit FilterControls(); virtual ~FilterControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent, IFilter *ptr); private: diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index 3b5dbd15..2e9bd61b 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -64,11 +64,6 @@ FilterControls::~FilterControls() { qDebug() << "~FilterControls() says: started"; } -void FilterControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // @@ -94,9 +89,6 @@ void FilterControls::Initialize(QWidget *parent, IFilter* ptr) { // void FilterControls::doOK() { save(); - if (pFilter) { - pFilter->Initialize(); - } this->close(); } diff --git a/ftnoir_filter_base/ftnoir_filter_base.h b/ftnoir_filter_base/ftnoir_filter_base.h index 5cd7b1d9..0dcf640a 100644 --- a/ftnoir_filter_base/ftnoir_filter_base.h +++ b/ftnoir_filter_base/ftnoir_filter_base.h @@ -26,7 +26,6 @@ struct IFilter { virtual ~IFilter() {} - virtual void Initialize() = 0; virtual void FilterHeadPoseData(double *current_camera_position, double *target_camera_position, double *new_camera_position, double *last_post_filter) = 0; }; diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp index c427a2cd..019da00b 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp @@ -49,13 +49,6 @@ FTNoIR_Filter::~FTNoIR_Filter() } -void FTNoIR_Filter::Initialize() -{ - qDebug() << "FTNoIR_Filter::Initialize says: Starting "; - loadSettings(); - return; -} - // // Load the current Settings from the currently 'active' INI-file. // diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h index 6c2a902b..7fc9c77e 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h @@ -42,7 +42,6 @@ public: FTNoIR_Filter(); ~FTNoIR_Filter(); - void Initialize(); void FilterHeadPoseData(double *current_camera_position, double *target_camera_position, double *new_camera_position, double *last_post_filter); private: @@ -74,8 +73,6 @@ public: explicit FilterControls(); virtual ~FilterControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent, IFilter* ptr); private: @@ -103,15 +100,11 @@ class FTNoIR_FilterDll : public Metadata public: FTNoIR_FilterDll(); ~FTNoIR_FilterDll(); + void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA Filter Mk2"); } + void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA"); } + void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Exponentially Weighted Moving Average filter with dynamic smoothing parameter"); } - void Release(); - void Initialize(); - - void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA Filter Mk2"); }; - void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA"); }; - void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Exponentially Weighted Moving Average filter with dynamic smoothing parameter"); }; - - void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png"); }; + void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png"); } }; #endif //INCLUDED_FTN_FILTER_H diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp index 120cba27..eb259572 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp @@ -66,11 +66,6 @@ FilterControls::~FilterControls() { qDebug() << "~FilterControls() says: started"; } -void FilterControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // @@ -98,9 +93,6 @@ void FilterControls::Initialize(QWidget *parent, IFilter* ptr) { // void FilterControls::doOK() { save(); - if (pFilter) { - pFilter->Initialize(); - } this->close(); } diff --git a/ftnoir_protocol_base/ftnoir_protocol_base.h b/ftnoir_protocol_base/ftnoir_protocol_base.h index 6980cb51..d6e4cb58 100644 --- a/ftnoir_protocol_base/ftnoir_protocol_base.h +++ b/ftnoir_protocol_base/ftnoir_protocol_base.h @@ -57,7 +57,6 @@ struct IProtocol { virtual ~IProtocol() {} - virtual void Initialize() = 0; virtual bool checkServerInstallationOK() = 0; virtual void sendHeadposeToGame( double *headpose, double *rawheadpose ) = 0; virtual QString getGameName() = 0; diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp index 0dcd8592..bbeac489 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp @@ -61,17 +61,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() } } -/** helper to Auto-destruct **/ -void FTNoIR_Protocol::Release() -{ - delete this; -} - -void FTNoIR_Protocol::Initialize() -{ - return; -} - // // Load the current Settings from the currently 'active' INI-file. // diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h index 87002213..1c4484b8 100644 --- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h +++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h @@ -46,10 +46,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Release(); - void Initialize(); - bool checkServerInstallationOK(); void sendHeadposeToGame( double *headpose, double *rawheadpose ); private: diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp index 3ddf6356..418003c0 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp @@ -56,17 +56,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() FSUIPCLib.unload(); } -/** helper to Auto-destruct **/ -void FTNoIR_Protocol::Release() -{ - delete this; -} - -void FTNoIR_Protocol::Initialize() -{ - return; -} - // // Scale the measured value to the Joystick values // diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h index d8f9e624..5da1d2ca 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h @@ -61,10 +61,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Release(); - void Initialize(); - bool checkServerInstallationOK(); void sendHeadposeToGame( double *headpose, double *rawheadpose ); QString getGameName() { @@ -90,8 +86,6 @@ public: explicit FSUIPCControls(); virtual ~FSUIPCControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent); void registerProtocol(IProtocol *protocol) { theProtocol = (FTNoIR_Protocol *) protocol; // Accept the pointer to the Protocol diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp index b4d9f115..301bc0f4 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp +++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp @@ -63,11 +63,6 @@ FSUIPCControls::~FSUIPCControls() { qDebug() << "~FSUIPCControls() says: started"; } -void FSUIPCControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index 257ed723..3108f0d7 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -79,11 +79,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() } } -void FTNoIR_Protocol::Initialize() -{ - return; -} - // // Read the game-data from CSV // diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index 2cc03ca6..2988de21 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -54,10 +54,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Release(); - void Initialize(); - bool checkServerInstallationOK( ); void sendHeadposeToGame( double *headpose, double *rawheadpose ); QString getGameName() { @@ -101,9 +97,7 @@ public: explicit FTControls(); virtual ~FTControls(); - void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL + void showEvent ( QShowEvent * event ); void Initialize(QWidget *parent); void registerProtocol(IProtocol *protocol) { theProtocol = (FTNoIR_Protocol *) protocol; // Accept the pointer to the Protocol diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp index 81077367..bfe83853 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.cpp @@ -51,11 +51,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() } } -void FTNoIR_Protocol::Initialize() -{ - loadSettings(); -} - // // Load the current Settings from the currently 'active' INI-file. // diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h index d6a30da7..1c4b493e 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn.h @@ -44,9 +44,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Initialize(); - bool checkServerInstallationOK(); void sendHeadposeToGame( double *headpose, double *rawheadpose ); QString getGameName() { @@ -69,8 +66,6 @@ public: explicit FTNControls(); virtual ~FTNControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent); void registerProtocol(IProtocol *protocol) {} void unRegisterProtocol() {} diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp index cd887fe9..a5265275 100644 --- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp +++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp @@ -71,11 +71,6 @@ FTNControls::~FTNControls() { qDebug() << "~FTNControls() says: started"; } -void FTNControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp index 5dfd86b7..40558254 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp @@ -42,7 +42,6 @@ FTNoIR_Protocol::FTNoIR_Protocol() prev_fMouse_Y = 0.0f; prev_fMouse_Wheel = 0.0f; frame_delay = 0; - loadSettings(); } @@ -51,24 +50,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() { } -/** helper to Auto-destruct **/ -void FTNoIR_Protocol::Release() -{ - delete this; -} - -void FTNoIR_Protocol::Initialize() -{ -int ScreenX, ScreenY; - - ScreenX = GetSystemMetrics(SM_CXSCREEN); - ScreenY = GetSystemMetrics(SM_CYSCREEN); - - qDebug() << "Initialize(): Screen width (x) = " << ScreenX << ", height (y) = " << ScreenY; - - return; -} - // // Scale the measured value to the Joystick values // diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h index 5da5c540..d5c614fa 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h @@ -65,10 +65,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Release(); - void Initialize(); - bool checkServerInstallationOK(); void sendHeadposeToGame( double *headpose, double *rawheadpose ); @@ -106,8 +102,6 @@ public: explicit MOUSEControls(); virtual ~MOUSEControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent); void registerProtocol(IProtocol *protocol) { theProtocol = (FTNoIR_Protocol *) protocol; // Accept the pointer to the Protocol diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp index ff55a858..6882ab6a 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp @@ -102,11 +102,6 @@ MOUSEControls::~MOUSEControls() { qDebug() << "~MOUSEControls() says: started"; } -void MOUSEControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index a4648a74..ba4c9012 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -153,53 +153,8 @@ PDWORD_PTR MsgResult = 0; // bool FTNoIR_Protocol::checkServerInstallationOK() { - // Code to activate the context for the SimConnect DLL - ACTCTXA act; - HANDLE hctx; - ULONG_PTR ulCookie; - - memset(&act, 0, sizeof(act)); - qDebug() << "SCCheckClientDLL says: Starting Function"; - try { -#if 0 - act.cbSize = sizeof(act); - act.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; - char full_path[2048]; - QByteArray foo = QCoreApplication::applicationDirPath().toLatin1(); - strcpy(full_path, foo.constData()); - strcat(full_path, "/opentrack-proto-simconnect.dll"); - - act.lpSource = full_path; - act.lpResourceName = MAKEINTRESOURCEA(101); - - hctx = CreateActCtxA (&act); - - if (hctx != INVALID_HANDLE_VALUE) { - if (!ActivateActCtx(hctx, &ulCookie)) { - ReleaseActCtx(hctx); - qDebug() << "SCCheckClientDLL says: Error activating SimConnect manifest"; - } - } - else { - qDebug() << "SCCheckClientDLL says: Error INVALID_HANDLE: " << GetLastError(); - return false; - } - // - // Just try to load the DLL. Let Windows handle the PATH's and such trivialities... - // - // - // Deactivate the context again: the function-references should stay in-tact... - // - DeactivateActCtx(0, ulCookie); - ReleaseActCtx(hctx); -#endif - } catch(...) { - qDebug() << "SCCheckClientDLL says: Error loading SimConnect DLL"; - return false; - } - const char* simconnect_paths[] = { "SimConnect.DLL", "C:\\Windows\\WinSxS\\x86_microsoft.flightsimulator.simconnect_67c7c14424d61b5b_10.0.60905.0_none_dd92b94d8a196297\\SimConnect.DLL", diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h index f069aa9c..62210d32 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h @@ -83,7 +83,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - void Initialize() {} bool checkServerInstallationOK(); void sendHeadposeToGame( double *headpose, double *rawheadpose ); QString getGameName() { @@ -136,8 +135,6 @@ public: explicit SCControls(); virtual ~SCControls(); void showEvent ( QShowEvent * event ); - - void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent); void registerProtocol(IProtocol *protocol) { theProtocol = (FTNoIR_Protocol *) protocol; // Accept the pointer to the Protocol diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp index 38ca9605..bbc56e54 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp @@ -64,11 +64,6 @@ SCControls::~SCControls() { qDebug() << "~SCControls() says: started"; } -void SCControls::Release() -{ - delete this; -} - // // Initialize tracker-client-dialog // diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp index 6fea845c..f4495e10 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp @@ -14,10 +14,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() VJoy_Shutdown(); } -void FTNoIR_Protocol::Initialize() -{ -} - void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose ) { JOYSTICK_STATE state[2] = { 0 }; diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h index d90a6124..5c260d2e 100644 --- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h +++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h @@ -44,9 +44,6 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol(); - - void Initialize(); - bool checkServerInstallationOK() { return true; } diff --git a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.h b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.h index b7490d42..032d6926 100644 --- a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.h +++ b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest.h @@ -64,9 +64,6 @@ class FTNoIR_TrackerDll : public Metadata public: FTNoIR_TrackerDll(); ~FTNoIR_TrackerDll(); - - void Initialize(); - void getFullName(QString *strToBeFilled); void getShortName(QString *strToBeFilled); void getDescription(QString *strToBeFilled); diff --git a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dll.cpp b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dll.cpp index 447bc120..3d59dc9b 100644 --- a/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dll.cpp +++ b/ftnoir_tracker_hillcrest/ftnoir_tracker_hillcrest_dll.cpp @@ -41,10 +41,6 @@ FTNoIR_TrackerDll::~FTNoIR_TrackerDll() { } -void FTNoIR_TrackerDll::Initialize() -{ -} - void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled) { *strToBeFilled = "Hillcrest"; diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp index df00c1ac..60db4aa2 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp @@ -109,18 +109,18 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->pyrlk_pyramids = 3; config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21; config->max_keypoints = 200; - config->keypoint_distance = 3; + config->keypoint_distance = 2.6; //config->force_width = 640; //config->force_height = 480; config->force_fps = iniFile.value("fps", 0).toInt(); config->camera_index = iniFile.value("camera-index", -1).toInt(); config->ransac_num_iters = 100; - config->ransac_max_reprojection_error = 3.9; - config->ransac_max_inlier_error = 4; + config->ransac_max_reprojection_error = 4.5; + config->ransac_max_inlier_error = 4.5; config->ransac_abs_max_mean_error = 8; - config->ransac_max_mean_error = 3.4; + config->ransac_max_mean_error = 3.6; config->debug = 0; - config->ransac_min_features = 0.9; + config->ransac_min_features = 0.85; int res = iniFile.value("resolution", 0).toInt(); if (res < 0 || res >= (int)(sizeof(resolution_choices) / sizeof(resolution_tuple))) res = 0; diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h index f684c55b..dde0bc9f 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h @@ -11,8 +11,6 @@ //----------------------------------------------------------------------------- class TrackerDll : public Metadata { - // ITrackerDll interface - void Initialize() {} void getFullName(QString *strToBeFilled); void getShortName(QString *strToBeFilled); void getDescription(QString *strToBeFilled); diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index 8ef85c51..631cc213 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -77,9 +77,6 @@ class FTNoIR_TrackerDll : public Metadata public: FTNoIR_TrackerDll(); ~FTNoIR_TrackerDll(); - - void Initialize(); - void getFullName(QString *strToBeFilled); void getShortName(QString *strToBeFilled); void getDescription(QString *strToBeFilled); diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp index ccf9225f..775eedfc 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp @@ -15,11 +15,6 @@ FTNoIR_TrackerDll::~FTNoIR_TrackerDll() } -void FTNoIR_TrackerDll::Initialize() -{ - return; -} - void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled) { *strToBeFilled = trackerFullName; diff --git a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp index 70326499..c824a217 100644 --- a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp +++ b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp @@ -45,12 +45,6 @@ FTNoIR_TrackerDll::~FTNoIR_TrackerDll() { } - -void FTNoIR_TrackerDll::Initialize() -{ - return; -} - void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled) { *strToBeFilled = trackerFullName; diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h index 6e200db6..c4c85372 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h @@ -84,8 +84,6 @@ public: FTNoIR_TrackerDll(); ~FTNoIR_TrackerDll(); - void Initialize(); - void getFullName(QString *strToBeFilled); void getShortName(QString *strToBeFilled); void getDescription(QString *strToBeFilled); diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp index cbb0c644..0e794842 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp @@ -46,30 +46,25 @@ FTNoIR_TrackerDll::~FTNoIR_TrackerDll() } -void FTNoIR_TrackerDll::Initialize() -{ - return; -} - void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled) { *strToBeFilled = trackerFullName; -}; +} void FTNoIR_TrackerDll::getShortName(QString *strToBeFilled) { *strToBeFilled = trackerShortName; -}; +} void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled) { *strToBeFilled = trackerDescription; -}; +} void FTNoIR_TrackerDll::getIcon(QIcon *icon) { *icon = QIcon(":/images/facetracknoir.png"); -}; +} //////////////////////////////////////////////////////////////////////////////// // Factory function that creates instances if the Tracker object. -- cgit v1.2.3