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

5 files changed, 306 insertions, 199 deletions

diff --git a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
index 9234c4d4..0eba8333 100644
--- a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
+++ b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
@@ -97,7 +97,7 @@ void FTNoIR_Protocol_FG::loadSettings() {
 //

 // Update Headpose in Game.

 //

-void FTNoIR_Protocol_FG::sendHeadposeToGame( THeadPoseData *headpose ) {

+void FTNoIR_Protocol_FG::sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose ) {

 int no_bytes;

 QHostAddress sender;

 quint16 senderPort;

@@ -243,191 +243,3 @@ FTNOIR_PROTOCOL_BASE_EXPORT IProtocolPtr __stdcall GetProtocol()
 {

 	return new FTNoIR_Protocol_FG;

 }

-

-//*******************************************************************************************************

-// FaceTrackNoIR Client Settings-dialog.

-//*******************************************************************************************************

-

-//

-// Constructor for server-settings-dialog

-//

-FGControls::FGControls() :

-QWidget()

-{

-	ui.setupUi( this );

-

-	QPoint offsetpos(100, 100);

-	//if (parent) {

-	//	this->move(parent->pos() + offsetpos);

-	//}

-

-	// Connect Qt signals to member-functions

-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));

-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));

-	connect(ui.chkLocalPC, SIGNAL(stateChanged(int)), this, SLOT(chkLocalPCOnlyChanged()));

-	connect(ui.spinIPFirstNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

-	connect(ui.spinIPSecondNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

-	connect(ui.spinIPThirdNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

-	connect(ui.spinIPFourthNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

-	connect(ui.spinPortNumber, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

-

-	// Load the settings from the current .INI-file

-	loadSettings();

-}

-

-//

-// Destructor for server-dialog

-//

-FGControls::~FGControls() {

-	qDebug() << "~FGControls() says: started";

-}

-

-void FGControls::Release()

-{

-    delete this;

-}

-

-//

-// Initialize tracker-client-dialog

-//

-void FGControls::Initialize(QWidget *parent) {

-

-	QPoint offsetpos(100, 100);

-	if (parent) {

-		this->move(parent->pos() + offsetpos);

-	}

-	show();

-}

-

-//

-// OK clicked on server-dialog

-//

-void FGControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

-void FGControls::showEvent ( QShowEvent * event ) {

-	loadSettings();

-}

-

-//

-// Cancel clicked on server-dialog

-//

-void FGControls::doCancel() {

-	//

-	// Ask if changed Settings should be saved

-	//

-	if (settingsDirty) {

-		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );

-

-		qDebug() << "doCancel says: answer =" << ret;

-

-		switch (ret) {

-			case QMessageBox::Save:

-				save();

-				this->close();

-				break;

-			case QMessageBox::Discard:

-				this->close();

-				break;

-			case QMessageBox::Cancel:

-				// Cancel was clicked

-				break;

-			default:

-				// should never be reached

-			break;

-		}

-	}

-	else {

-		this->close();

-	}

-}

-

-//

-// Load the current Settings from the currently 'active' INI-file.

-//

-void FGControls::loadSettings() {

-//	qDebug() << "loadSettings says: Starting ";

-	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

-

-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

-

-//	qDebug() << "loadSettings says: iniFile = " << currentFile;

-

-	iniFile.beginGroup ( "FG" );

-	ui.chkLocalPC->setChecked (iniFile.value ( "LocalPCOnly", 1 ).toBool());

-

-	ui.spinIPFirstNibble->setValue( iniFile.value ( "IP-1", 192 ).toInt() );

-	ui.spinIPSecondNibble->setValue( iniFile.value ( "IP-2", 168 ).toInt() );

-	ui.spinIPThirdNibble->setValue( iniFile.value ( "IP-3", 2 ).toInt() );

-	ui.spinIPFourthNibble->setValue( iniFile.value ( "IP-4", 1 ).toInt() );

-

-	ui.spinPortNumber->setValue( iniFile.value ( "PortNumber", 5550 ).toInt() );

-	iniFile.endGroup ();

-

-	chkLocalPCOnlyChanged();	

-	settingsDirty = false;

-}

-

-//

-// Save the current Settings to the currently 'active' INI-file.

-//

-void FGControls::save() {

-	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

-

-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

-

-	iniFile.beginGroup ( "FG" );

-	iniFile.setValue ( "LocalPCOnly", ui.chkLocalPC->isChecked() );

-	iniFile.setValue ( "IP-1", ui.spinIPFirstNibble->value() );

-	iniFile.setValue ( "IP-2", ui.spinIPSecondNibble->value() );

-	iniFile.setValue ( "IP-3", ui.spinIPThirdNibble->value() );

-	iniFile.setValue ( "IP-4", ui.spinIPFourthNibble->value() );

-	iniFile.setValue ( "PortNumber", ui.spinPortNumber->value() );

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-//

-// Handle change of the checkbox.

-//

-void FGControls::chkLocalPCOnlyChanged() {

-

-	if ( ui.chkLocalPC->isChecked() ) {

-		ui.spinIPFirstNibble->setValue( 127 );

-		ui.spinIPFirstNibble->setEnabled ( false );

-		ui.spinIPSecondNibble->setValue( 0 );

-		ui.spinIPSecondNibble->setEnabled ( false );

-		ui.spinIPThirdNibble->setValue( 0 );

-		ui.spinIPThirdNibble->setEnabled ( false );

-		ui.spinIPFourthNibble->setValue( 1 );

-		ui.spinIPFourthNibble->setEnabled ( false );

-	}

-	else {

-		ui.spinIPFirstNibble->setEnabled ( true );

-		ui.spinIPSecondNibble->setEnabled ( true );

-		ui.spinIPThirdNibble->setEnabled ( true );

-		ui.spinIPFourthNibble->setEnabled ( true );

-	}

-

-	settingsDirty = true;

-}

-

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

-// Factory function that creates instances if the Protocol-settings dialog object.

-

-// Export both decorated and undecorated names.

-//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress

-//                          Win32 API function.

-//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.

-#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

-

-FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialogPtr __stdcall GetProtocolDialog( )

-{

-	return new FGControls;

-}

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

diff --git a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.vcproj b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.vcproj
index 9e34aa64..c37903ad 100644
--- a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.vcproj
+++ b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.vcproj
@@ -171,6 +171,14 @@
 				RelativePath=".\ftnoir_Protocol_FG.cpp"

 				>

 			</File>

+			<File

+				RelativePath=".\ftnoir_protocol_fg_dialog.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\ftnoir_protocol_fg_dll.cpp"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

diff --git a/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dialog.cpp b/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dialog.cpp
new file mode 100644
index 00000000..987a81f9
--- /dev/null
+++ b/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dialog.cpp
@@ -0,0 +1,223 @@
+/********************************************************************************

+* FaceTrackNoIR		This program is a private project of the some enthusiastic	*

+*					gamers from Holland, who don't like to pay much for			*

+*					head-tracking.												*

+*																				*

+* Copyright (C) 2010	Wim Vriend (Developing)									*

+*						Ron Hendriks (Researching and Testing)					*

+*																				*

+* Homepage																		*

+*																				*

+* This program is free software; you can redistribute it and/or modify it		*

+* under the terms of the GNU General Public License as published by the			*

+* Free Software Foundation; either version 3 of the License, or (at your		*

+* option) any later version.													*

+*																				*

+* This program is distributed in the hope that it will be useful, but			*

+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

+* more details.																	*

+*																				*

+* You should have received a copy of the GNU General Public License along		*

+* with this program; if not, see <http://www.gnu.org/licenses/>.				*

+*																				*

+* FGServer			FGServer is the Class, that communicates headpose-data		*

+*					to FlightGear, using UDP.				         			*

+*					It is based on the (Linux) example made by Melchior FRANZ.	*

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

+/*

+	Modifications (last one on top):

+	20110401 - WVR: Moved protocol to a DLL, convenient for installation etc.

+	20101224 - WVR: Base class is no longer inheriting QThread. sendHeadposeToGame

+					is called from run() of Tracker.cpp

+*/

+#include "ftnoir_protocol_fg.h"

+#include <QFile>

+

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

+// FaceTrackNoIR Client Settings-dialog.

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

+

+//

+// Constructor for server-settings-dialog

+//

+FGControls::FGControls() :

+QWidget()

+{

+	ui.setupUi( this );

+

+	QPoint offsetpos(100, 100);

+	//if (parent) {

+	//	this->move(parent->pos() + offsetpos);

+	//}

+

+	// Connect Qt signals to member-functions

+	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));

+	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));

+	connect(ui.chkLocalPC, SIGNAL(stateChanged(int)), this, SLOT(chkLocalPCOnlyChanged()));

+	connect(ui.spinIPFirstNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

+	connect(ui.spinIPSecondNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

+	connect(ui.spinIPThirdNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

+	connect(ui.spinIPFourthNibble, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

+	connect(ui.spinPortNumber, SIGNAL(valueChanged(int)), this, SLOT(settingChanged()));

+

+	// Load the settings from the current .INI-file

+	loadSettings();

+}

+

+//

+// Destructor for server-dialog

+//

+FGControls::~FGControls() {

+	qDebug() << "~FGControls() says: started";

+}

+

+void FGControls::Release()

+{

+    delete this;

+}

+

+//

+// Initialize tracker-client-dialog

+//

+void FGControls::Initialize(QWidget *parent) {

+

+	QPoint offsetpos(100, 100);

+	if (parent) {

+		this->move(parent->pos() + offsetpos);

+	}

+	show();

+}

+

+//

+// OK clicked on server-dialog

+//

+void FGControls::doOK() {

+	save();

+	this->close();

+}

+

+// override show event

+void FGControls::showEvent ( QShowEvent * event ) {

+	loadSettings();

+}

+

+//

+// Cancel clicked on server-dialog

+//

+void FGControls::doCancel() {

+	//

+	// Ask if changed Settings should be saved

+	//

+	if (settingsDirty) {

+		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );

+

+		qDebug() << "doCancel says: answer =" << ret;

+

+		switch (ret) {

+			case QMessageBox::Save:

+				save();

+				this->close();

+				break;

+			case QMessageBox::Discard:

+				this->close();

+				break;

+			case QMessageBox::Cancel:

+				// Cancel was clicked

+				break;

+			default:

+				// should never be reached

+			break;

+		}

+	}

+	else {

+		this->close();

+	}

+}

+

+//

+// Load the current Settings from the currently 'active' INI-file.

+//

+void FGControls::loadSettings() {

+//	qDebug() << "loadSettings says: Starting ";

+	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

+

+	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

+	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

+

+//	qDebug() << "loadSettings says: iniFile = " << currentFile;

+

+	iniFile.beginGroup ( "FG" );

+	ui.chkLocalPC->setChecked (iniFile.value ( "LocalPCOnly", 1 ).toBool());

+

+	ui.spinIPFirstNibble->setValue( iniFile.value ( "IP-1", 192 ).toInt() );

+	ui.spinIPSecondNibble->setValue( iniFile.value ( "IP-2", 168 ).toInt() );

+	ui.spinIPThirdNibble->setValue( iniFile.value ( "IP-3", 2 ).toInt() );

+	ui.spinIPFourthNibble->setValue( iniFile.value ( "IP-4", 1 ).toInt() );

+

+	ui.spinPortNumber->setValue( iniFile.value ( "PortNumber", 5550 ).toInt() );

+	iniFile.endGroup ();

+

+	chkLocalPCOnlyChanged();	

+	settingsDirty = false;

+}

+

+//

+// Save the current Settings to the currently 'active' INI-file.

+//

+void FGControls::save() {

+	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

+

+	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

+	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

+

+	iniFile.beginGroup ( "FG" );

+	iniFile.setValue ( "LocalPCOnly", ui.chkLocalPC->isChecked() );

+	iniFile.setValue ( "IP-1", ui.spinIPFirstNibble->value() );

+	iniFile.setValue ( "IP-2", ui.spinIPSecondNibble->value() );

+	iniFile.setValue ( "IP-3", ui.spinIPThirdNibble->value() );

+	iniFile.setValue ( "IP-4", ui.spinIPFourthNibble->value() );

+	iniFile.setValue ( "PortNumber", ui.spinPortNumber->value() );

+	iniFile.endGroup ();

+

+	settingsDirty = false;

+}

+

+//

+// Handle change of the checkbox.

+//

+void FGControls::chkLocalPCOnlyChanged() {

+

+	if ( ui.chkLocalPC->isChecked() ) {

+		ui.spinIPFirstNibble->setValue( 127 );

+		ui.spinIPFirstNibble->setEnabled ( false );

+		ui.spinIPSecondNibble->setValue( 0 );

+		ui.spinIPSecondNibble->setEnabled ( false );

+		ui.spinIPThirdNibble->setValue( 0 );

+		ui.spinIPThirdNibble->setEnabled ( false );

+		ui.spinIPFourthNibble->setValue( 1 );

+		ui.spinIPFourthNibble->setEnabled ( false );

+	}

+	else {

+		ui.spinIPFirstNibble->setEnabled ( true );

+		ui.spinIPSecondNibble->setEnabled ( true );

+		ui.spinIPThirdNibble->setEnabled ( true );

+		ui.spinIPFourthNibble->setEnabled ( true );

+	}

+

+	settingsDirty = true;

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// Factory function that creates instances if the Protocol-settings dialog object.

+

+// Export both decorated and undecorated names.

+//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress

+//                          Win32 API function.

+//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.

+#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

+

+FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialogPtr __stdcall GetProtocolDialog( )

+{

+	return new FGControls;

+}
\ No newline at end of file
diff --git a/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dll.cpp b/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dll.cpp
new file mode 100644
index 00000000..ca71063b
--- /dev/null
+++ b/FTNoIR_Protocol_FG/ftnoir_protocol_fg_dll.cpp
@@ -0,0 +1,56 @@
+/********************************************************************************

+* FaceTrackNoIR		This program is a private project of some enthusiastic		*

+*					gamers from Holland, who don't like to pay much for			*

+*					head-tracking.												*

+*																				*

+* Copyright (C) 2012	Wim Vriend (Developing)									*

+*						Ron Hendriks (Researching and Testing)					*

+*																				*

+* Homepage																		*

+*																				*

+* This program is free software; you can redistribute it and/or modify it		*

+* under the terms of the GNU General Public License as published by the			*

+* Free Software Foundation; either version 3 of the License, or (at your		*

+* option) any later version.													*

+*																				*

+* This program is distributed in the hope that it will be useful, but			*

+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

+* more details.																	*

+*																				*

+* You should have received a copy of the GNU General Public License along		*

+* with this program; if not, see <http://www.gnu.org/licenses/>.				*

+*																				*

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

+/*

+	Modifications (last one on top):

+		20120830 - WVR: The Dialog class was used to get general info on the DLL. This

+						had a big disadvantage: the complete dialog was loaded, just to get

+						some data and then it was deleted again (without ever showing the dialog).

+						The ProtocolDll class solves this.

+						The functions to get the name(s) and icon were removed from the two other classes.

+*/

+#include "ftnoir_protocol_fg.h"

+#include <QDebug>

+

+FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {

+}

+

+FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()

+{

+

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// Factory function that creates instances if the Protocol object.

+

+// Export both decorated and undecorated names.

+//   GetProtocolDll     - Undecorated name, which can be easily used with GetProcAddress

+//						Win32 API function.

+//   _GetProtocolDll@0  - Common name decoration for __stdcall functions in C language.

+#pragma comment(linker, "/export:GetProtocolDll=_GetProtocolDll@0")

+

+FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDllPtr __stdcall GetProtocolDll()

+{

+	return new FTNoIR_ProtocolDll;

+}