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, 272 insertions, 165 deletions

diff --git a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
index f533fdf3..4689c92f 100644
--- a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
+++ b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
@@ -128,7 +128,7 @@ void FTNoIR_Protocol_PPJOY::loadSettings() {
 //

 // Update Headpose in Game.

 //

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

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

 float virtPosX;

 float virtPosY;

 float virtPosZ;

@@ -217,157 +217,3 @@ FTNOIR_PROTOCOL_BASE_EXPORT IProtocolPtr __stdcall GetProtocol()
 {

 	return new FTNoIR_Protocol_PPJOY;

 }

-

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

-// FaceTrackNoIR Client Settings-dialog.

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

-

-//

-// Constructor for server-settings-dialog

-//

-PPJOYControls::PPJOYControls() :

-QWidget()

-{

-	ui.setupUi( this );

-

-	// Connect Qt signals to member-functions

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

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

-	connect(ui.cbxSelectPPJoyNumber, SIGNAL(currentIndexChanged(int)), this, SLOT(virtualJoystickSelected( int )));

-

-	for (int i = 1 ; i < 17; i++) {

-		QString cbxText = QString("Virtual Joystick %1").arg(i);

-		ui.cbxSelectPPJoyNumber->addItem(QIcon("images/PPJoy.ico"), cbxText);

-	}

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

-	loadSettings();

-}

-

-//

-// Destructor for server-dialog

-//

-PPJOYControls::~PPJOYControls() {

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

-}

-

-void PPJOYControls::Release()

-{

-    delete this;

-}

-

-//

-// Initialize tracker-client-dialog

-//

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

-

-	QPoint offsetpos(100, 100);

-	if (parent) {

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

-	}

-	show();

-}

-

-//

-// OK clicked on server-dialog

-//

-void PPJOYControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

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

-	loadSettings();

-}

-

-//

-// Cancel clicked on server-dialog

-//

-void PPJOYControls::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 PPJOYControls::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 ( "PPJoy" );

-	ui.cbxSelectPPJoyNumber->setCurrentIndex(iniFile.value ( "Selection", 1 ).toInt() - 1);

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-//

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

-//

-void PPJOYControls::save() {

-	qDebug() << "save() says: started";

-

-	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 ( "PPJoy" );

-	iniFile.setValue ( "Selection", ui.cbxSelectPPJoyNumber->currentIndex() + 1 );

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-//

-// Handle changes of the Virtual Joystick selection

-//

-void PPJOYControls::virtualJoystickSelected( int index )

-{

-	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 PPJOYControls;

-}

diff --git a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
index 266fd877..b9220916 100644
--- a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
+++ b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
@@ -69,13 +69,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("PPJoy Virtual Joystick"); };

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

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("PPJoy virtual joystick protocol"); };

-

 private:

 	HANDLE h;

 	JOYSTICK_STATE JoyState;

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

     void Initialize(QWidget *parent);

 

-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("PPJoy Virtual Joystick"); };

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

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("PPJoy virtual joystick protocol"); };

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

-

 private:

 	Ui::UICPPJOYControls ui;

 	void loadSettings();

@@ -127,5 +118,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("PPJoy Virtual Joystick"); };

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

+	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("PPJoy virtual joystick protocol"); };

+

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

+};

+

+

 #endif//INCLUDED_PPJOYSERVER_H

 //END

diff --git a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.vcproj b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.vcproj
index e8332f65..7a42d19f 100644
--- a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.vcproj
+++ b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.vcproj
@@ -171,6 +171,14 @@
 				RelativePath=".\ftnoir_Protocol_PPJOY.cpp"

 				>

 			</File>

+			<File

+				RelativePath=".\ftnoir_protocol_PPJOY_dialog.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\ftnoir_protocol_PPJOY_dll.cpp"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

diff --git a/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_dialog.cpp b/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_dialog.cpp
new file mode 100644
index 00000000..fb9e1bd5
--- /dev/null
+++ b/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_dialog.cpp
@@ -0,0 +1,189 @@
+/********************************************************************************

+* 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_PPJOY.h"

+#include <QDebug>

+

+

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

+// FaceTrackNoIR Client Settings-dialog.

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

+

+//

+// Constructor for server-settings-dialog

+//

+PPJOYControls::PPJOYControls() :

+QWidget()

+{

+	ui.setupUi( this );

+

+	// Connect Qt signals to member-functions

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

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

+	connect(ui.cbxSelectPPJoyNumber, SIGNAL(currentIndexChanged(int)), this, SLOT(virtualJoystickSelected( int )));

+

+	for (int i = 1 ; i < 17; i++) {

+		QString cbxText = QString("Virtual Joystick %1").arg(i);

+		ui.cbxSelectPPJoyNumber->addItem(QIcon("images/PPJoy.ico"), cbxText);

+	}

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

+	loadSettings();

+}

+

+//

+// Destructor for server-dialog

+//

+PPJOYControls::~PPJOYControls() {

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

+}

+

+void PPJOYControls::Release()

+{

+    delete this;

+}

+

+//

+// Initialize tracker-client-dialog

+//

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

+

+	QPoint offsetpos(100, 100);

+	if (parent) {

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

+	}

+	show();

+}

+

+//

+// OK clicked on server-dialog

+//

+void PPJOYControls::doOK() {

+	save();

+	this->close();

+}

+

+// override show event

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

+	loadSettings();

+}

+

+//

+// Cancel clicked on server-dialog

+//

+void PPJOYControls::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 PPJOYControls::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 ( "PPJoy" );

+	ui.cbxSelectPPJoyNumber->setCurrentIndex(iniFile.value ( "Selection", 1 ).toInt() - 1);

+	iniFile.endGroup ();

+

+	settingsDirty = false;

+}

+

+//

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

+//

+void PPJOYControls::save() {

+	qDebug() << "save() says: started";

+

+	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 ( "PPJoy" );

+	iniFile.setValue ( "Selection", ui.cbxSelectPPJoyNumber->currentIndex() + 1 );

+	iniFile.endGroup ();

+

+	settingsDirty = false;

+}

+

+//

+// Handle changes of the Virtual Joystick selection

+//

+void PPJOYControls::virtualJoystickSelected( int index )

+{

+	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 PPJOYControls;

+}

diff --git a/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_dll.cpp b/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_dll.cpp
new file mode 100644
index 00000000..67536857
--- /dev/null
+++ b/FTNoIR_Protocol_PPJOY/ftnoir_protocol_PPJOY_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_PPJOY.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;

+}