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, 1 insertions, 157 deletions

diff --git a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp
index 0c8b2fbf..f3585b0e 100644
--- a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp
+++ b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp
@@ -124,7 +124,7 @@ void FTNoIR_Protocol_FTIR::loadSettings() {
 //

 // Update Headpose in Game.

 //

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

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

 float virtPosX;

 float virtPosY;

 float virtPosZ;

@@ -399,159 +399,3 @@ FTNOIR_PROTOCOL_BASE_EXPORT IProtocolPtr __stdcall GetProtocol()
 {

 	return new FTNoIR_Protocol_FTIR;

 }

-

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

-// FaceTrackNoIR Client Settings-dialog.

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

-

-//

-// Constructor for server-settings-dialog

-//

-FTIRControls::FTIRControls() :

-QWidget()

-{

-	QString aFileName;														// File Path and Name

-

-	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.chkTIRViews, SIGNAL(stateChanged(int)), this, SLOT(chkTIRViewsChanged()));

-	connect(ui.chkStartDummy, SIGNAL(stateChanged(int)), this, SLOT(settingChanged()));

-

-	aFileName = QCoreApplication::applicationDirPath() + "/";

-	aFileName.append(FTIR_VIEWS_FILENAME);

-	if ( !QFile::exists( aFileName ) ) {

-		ui.chkTIRViews->setChecked( false );

-		ui.chkTIRViews->setEnabled ( false );

-	}

-	else {

-		ui.chkTIRViews->setEnabled ( true );

-	}

-

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

-	loadSettings();

-}

-

-//

-// Destructor for server-dialog

-//

-FTIRControls::~FTIRControls() {

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

-}

-

-void FTIRControls::Release()

-{

-    delete this;

-}

-

-//

-// Initialize tracker-client-dialog

-//

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

-

-	QPoint offsetpos(100, 100);

-	if (parent) {

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

-	}

-	show();

-}

-

-//

-// OK clicked on server-dialog

-//

-void FTIRControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

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

-	loadSettings();

-}

-

-//

-// Cancel clicked on server-dialog

-//

-void FTIRControls::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 FTIRControls::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 ( "FTIR" );

-	ui.chkTIRViews->setChecked (iniFile.value ( "useTIRViews", 0 ).toBool());

-	ui.chkStartDummy->setChecked (iniFile.value ( "useDummyExe", 1 ).toBool());

-

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-//

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

-//

-void FTIRControls::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 ( "FTIR" );

-	iniFile.setValue ( "useTIRViews", ui.chkTIRViews->isChecked() );

-	iniFile.setValue ( "useDummyExe", ui.chkStartDummy->isChecked() );

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

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

-// 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 FTIRControls;

-}