Modified sendHeadposeToGame, so it also sends raw data.

Unified the code by adding the Dll class to the protocols and moving the dialog to a separate source.

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

1 files changed, 18 insertions, 10 deletions

diff --git a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
index ff3be6bd..b836d321 100644
--- a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
+++ b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
@@ -49,13 +49,9 @@ public:
     void Initialize();

 

 	bool checkServerInstallationOK( HANDLE handle );

-	void sendHeadposeToGame( THeadPoseData *headpose );

+	void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose );

 	void getNameFromGame( char *dest );						// Take care dest can handle up to 100 chars...

 

-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

-	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear UDP protocol"); };

-

 private:

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

 	TFlightGearData FlightData;

@@ -82,11 +78,6 @@ public:
 	void Release();											// Member functions which are accessible from outside the DLL

     void Initialize(QWidget *parent);

 

-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

-	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear UDP protocol"); };

-	void getIcon(QIcon *icon) { *icon = QIcon(":/images/FlightGear.ico"); };

-

 private:

 	Ui::UICFGControls ui;

 	void loadSettings();

@@ -102,5 +93,22 @@ private slots:
 	void settingChanged() { settingsDirty = true; };

 };

 

+//*******************************************************************************************************

+// FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol

+//*******************************************************************************************************

+class FTNoIR_ProtocolDll : public IProtocolDll

+{

+public:

+	FTNoIR_ProtocolDll();

+	~FTNoIR_ProtocolDll();

+

+	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

+	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear"); };

+	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("FlightGear UDP protocol"); };

+

+	void getIcon(QIcon *icon) { *icon = QIcon(":/images/FlightGear.ico"); };

+};

+

+

 #endif//INCLUDED_FGSERVER_H

 //END