win32: all plugins in Windows binary distro updated to new api

6 files changed, 15 insertions, 17 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index 268abeab..219c8990 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -229,9 +229,9 @@ void Tracker::GetHeadPoseData(THeadPoseData *data)
 		Vec3f   t = X_GH.t - X_GH_0.t;		

 

         // get translation(s)

-        if (s.bEnableX) data[TX] = t[0] / 10.0;	// convert to cm

-        if (s.bEnableY) data[TY] = t[1] / 10.0;

-        if (s.bEnableZ) data[TZ] = t[2] / 10.0;

+        data[TX] = t[0] / 10.0;	// convert to cm

+        data[TY] = t[1] / 10.0;

+        data[TZ] = t[2] / 10.0;

 

         // translate rotation matrix from opengl (G) to roll-pitch-yaw (E) frame

 		// -z -> x, y -> z, x -> -y

@@ -246,18 +246,18 @@ void Tracker::GetHeadPoseData(THeadPoseData *data)
 		alpha = atan2( R(1,0), R(0,0));

 		gamma = atan2( R(2,1), R(2,2));		

 

-        if (s.bEnableYaw)   data[Yaw]  =   rad2deg * alpha;

-        if (s.bEnablePitch) data[Pitch] = - rad2deg * beta;	// FTNoIR expects a minus here

-        if (s.bEnableRoll)  data[Roll]  =   rad2deg * gamma;

+        data[Yaw]   =   rad2deg * alpha;

+        data[Pitch] = - rad2deg * beta;	// FTNoIR expects a minus here

+        data[Roll]  =   rad2deg * gamma;

 	}

 }

 

 //-----------------------------------------------------------------------------

 #ifdef OPENTRACK_API

-extern "C" FTNOIR_TRACKER_BASE_EXPORT ITracker* CALLING_CONVENTION GetConstructor()

+extern "C" OPENTRACK_EXPORT ITracker* CALLING_CONVENTION GetConstructor()

 #else

 #pragma comment(linker, "/export:GetTracker=_GetTracker@0")

-FTNOIR_TRACKER_BASE_EXPORT ITrackerPtr __stdcall GetTracker()

+OPENTRACK_EXPORT ITrackerPtr __stdcall GetTracker()

 #endif

 {

 	return new Tracker;

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
index 7e944fc2..63b8353e 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
@@ -9,8 +9,7 @@
 #define FTNOIR_TRACKER_PT_H

 

 #ifdef OPENTRACK_API

-#   include "ftnoir_tracker_base/ftnoir_tracker_base.h"

-#   include "facetracknoir/plugin-support.h"

+#   include "facetracknoir/plugin-api.hpp"

 #endif

 #include "ftnoir_tracker_pt_settings.h"

 #include "frame_observer.h"

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index 4ba981a5..ae84ce8c 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -13,7 +13,7 @@
 #ifndef OPENTRACK_API

 #   include <boost/shared_ptr.hpp>

 #else

-#   include <memory>
+#   include <memory>

 #endif

 #include <vector>

 

@@ -308,7 +308,7 @@ void TrackerDialog::unRegisterTracker()
 	ui.reset_button->setEnabled(false);

 }

 

-extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )

+extern "C" OPENTRACK_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )

 {

 	return new TrackerDialog;

 }

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.h
index 0325160d..5cb09130 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 "ftnoir_tracker_base/ftnoir_tracker_base.h"

+#   include "facetracknoir/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 15e830a4..dd7b08d6 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
@@ -32,10 +32,10 @@ void TrackerDll::getIcon(QIcon *icon)
 

 #ifdef OPENTRACK_API

 #   include "facetracknoir/plugin-support.h"

-extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()

+extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()

 #else

 #   pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")

-FTNOIR_TRACKER_BASE_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()

+OPENTRACK_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()

 #endif

 {

 	return new TrackerDll;

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
index 22e1ff29..fce7aec2 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
@@ -6,8 +6,7 @@
  */

 

 #if defined(OPENTRACK_API)

-#   include "ftnoir_tracker_base/ftnoir_tracker_base.h"

-#   include "facetracknoir/plugin-support.h"

+#   include "facetracknoir/plugin-api.hpp"

 #else

 #   include "../ftnoir_tracker_base/ftnoir_tracker_base.h"

 #endif