Base Class for Game protocol

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@30 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 3 insertions, 14 deletions

diff --git a/FaceTrackNoIR/PPJoyServer.h b/FaceTrackNoIR/PPJoyServer.h
index 165a82f5..31e7f97a 100644
--- a/FaceTrackNoIR/PPJoyServer.h
+++ b/FaceTrackNoIR/PPJoyServer.h
@@ -28,6 +28,7 @@
 #ifndef INCLUDED_PPJOYSERVER_H

 #define INCLUDED_PPJOYSERVER_H

  

+#include "FTNoIR_cxx_protocolserver.h"

 #include "PPJIoctl.h"

 #include <QString>

 #include <QMessageBox>

@@ -42,6 +43,7 @@
 #include "ui_FTNoIR_ppjoycontrols.h"

 

 using namespace std;

+using namespace v4friend::ftnoir;

 

 class Tracker;				// pre-define parent-class to avoid circular includes

 

@@ -59,7 +61,7 @@ typedef struct
 }	JOYSTICK_STATE;

 #pragma pack(pop)

 

-class PPJoyServer : public QThread {

+class PPJoyServer : public ProtocolServerBase {

 	Q_OBJECT

 

 public: 

@@ -76,10 +78,6 @@ private slots:
 //	void readPendingDatagrams();

 

 private:

-	// Handles to neatly terminate thread...

-	HANDLE m_StopThread;

-	HANDLE m_WaitThread;

-

 	Tracker *headTracker;									// For upstream messages...

 	

 	HANDLE h;

@@ -93,15 +91,6 @@ private:
 //	static long analogDefault,PPJoyCorrection;

 	long centerPos[3],centerRot[3];

 

-	/** member variables for saving the head pose **/

-	float virtPosX;

-	float virtPosY;

-	float virtPosZ;

-	

-	float virtRotX;

-	float virtRotY;

-	float virtRotZ;

-

 	void checkAnalogLimits();

 	long scale2AnalogLimits( float x, float min_x, float max_x );

 	void loadSettings();