From 7dc20f380c80b1b0597e619e66d23921f0309aa0 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Tue, 8 Mar 2011 22:10:06 +0000 Subject: Start after update 1.5 Begin placing faceAPI in DLL git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@52 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h | 2 +- FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.vcproj | 26 +-------- FTNoIR_Tracker_UDP/ftnoir_tracker_base.h | 71 ------------------------- FTNoIR_Tracker_UDP/ftnoir_tracker_base_global.h | 12 ----- FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp | 2 +- 5 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 FTNoIR_Tracker_UDP/ftnoir_tracker_base.h delete mode 100644 FTNoIR_Tracker_UDP/ftnoir_tracker_base_global.h (limited to 'FTNoIR_Tracker_UDP') diff --git a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h index b3467341..9a0cad1f 100644 --- a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h +++ b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.h @@ -1,4 +1,4 @@ -#include "ftnoir_tracker_base.h" +#include "..\ftnoir_tracker_base\ftnoir_tracker_base.h" #include "ui_FTNoIR_FTNClientcontrols.h" #include #include diff --git a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.vcproj b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.vcproj index ae299ed2..2e01f009 100644 --- a/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.vcproj +++ b/FTNoIR_Tracker_UDP/FTNoIR_Tracker_UDP.vcproj @@ -178,33 +178,11 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > - - - - - - - -// -// x,y,z position in centimetres, yaw, pitch and roll in degrees... -// -#pragma pack(push, 2) -struct THeadPoseData { - double x, y, z, yaw, pitch, roll; -}; -#pragma pack(pop) - -// COM-Like abstract interface. -// This interface doesn't require __declspec(dllexport/dllimport) specifier. -// Method calls are dispatched via virtual table. -// Any C++ compiler can use it. -// Instances are obtained via factory function. -struct ITracker -{ - virtual void Release() = 0; // Member required to enable Auto-remove - virtual void Initialize() = 0; - virtual void StartTracker() = 0; - virtual void GiveHeadPoseData(THeadPoseData *data) = 0; -}; - -// Handle type. In C++ language the iterface type is used. -typedef ITracker* TRACKERHANDLE; - -//////////////////////////////////////////////////////////////////////////////// -// -#ifdef __cplusplus -# define EXTERN_C extern "C" -#else -# define EXTERN_C -#endif // __cplusplus - -// Factory function that creates instances of the Tracker object. -EXTERN_C -FTNOIR_TRACKER_BASE_EXPORT -TRACKERHANDLE -__stdcall -GetTracker( - void); - - -// COM-Like abstract interface. -// This interface doesn't require __declspec(dllexport/dllimport) specifier. -// Method calls are dispatched via virtual table. -// Any C++ compiler can use it. -// Instances are obtained via factory function. -struct ITrackerDialog -{ - virtual void Release() = 0; // Member required to enable Auto-remove - virtual void Initialize(QWidget *parent) = 0; -}; - -// Handle type. In C++ language the iterface type is used. -typedef ITrackerDialog* TRACKERDIALOGHANDLE; - -// Factory function that creates instances of the Tracker object. -EXTERN_C -FTNOIR_TRACKER_BASE_EXPORT -TRACKERDIALOGHANDLE -__stdcall -GetTrackerDialog(void); - - -#endif // FTNOIR_TRACKER_BASE_H diff --git a/FTNoIR_Tracker_UDP/ftnoir_tracker_base_global.h b/FTNoIR_Tracker_UDP/ftnoir_tracker_base_global.h deleted file mode 100644 index 9f4a6118..00000000 --- a/FTNoIR_Tracker_UDP/ftnoir_tracker_base_global.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FTNOIR_TRACKER_BASE_GLOBAL_H -#define FTNOIR_TRACKER_BASE_GLOBAL_H - -#include - -#ifdef FTNOIR_TRACKER_BASE_LIB -# define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_EXPORT -#else -# define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_IMPORT -#endif - -#endif // FTNOIR_TRACKER_BASE_GLOBAL_H diff --git a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp index 93ef60b6..1a64261e 100644 --- a/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp +++ b/FTNoIR_Tracker_UDP/ftnoir_tracker_udp.cpp @@ -88,7 +88,7 @@ quint16 senderPort; //for lower cpu load usleep(10000); - yieldCurrentThread(); +// yieldCurrentThread(); } } -- cgit v1.2.3