Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 110 insertions, 131 deletions

diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
index 5da1d2ca..ff8d3b7f 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
@@ -1,131 +1,110 @@
-/********************************************************************************

-* 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) 2010-2011	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/>.				*

-*																				*

-* FSUIPCServer		FSUIPCServer is the Class, that communicates headpose-data	*

-*					to games, using the FSUIPC.dll.			         			*

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

-#pragma once

-#ifndef INCLUDED_FSUIPCSERVER_H

-#define INCLUDED_FSUIPCSERVER_H

-

-#include "Windows.h"

-#include <stdlib.h>

-#include "FSUIPC_User.h"

-#include "facetracknoir/global-settings.h"

-

-#include "..\ftnoir_protocol_base\ftnoir_protocol_base.h"

-#include "ui_FTNoIR_FSUIPCcontrols.h"

-#include <QMessageBox>

-#include <QSettings>

-#include <QLibrary>

-#include <QProcess>

-#include <QDebug>

-#include <QFile>

-#include <QFileDialog>

-

-#define FSUIPC_FILENAME "C:\\Program Files\\Microsoft Games\\Flight Simulator 9\\Modules\\FSUIPC.dll"

-

-//

-// Define the structures necessary for the FSUIPC_Write calls

-//

-#pragma pack(push,1)		// All fields in structure must be byte aligned.

-typedef struct

-{

- int Control;				// Control identifier

- int Value;					// Value of DOF

-} TFSState;

-#pragma pack(pop)

-

-class FTNoIR_Protocol : public IProtocol

-{

-public:

-	FTNoIR_Protocol();

-	~FTNoIR_Protocol();

-    bool checkServerInstallationOK();

-    void sendHeadposeToGame( double *headpose, double *rawheadpose );

-    QString getGameName() {

-        return "Microsoft Flight Simulator X";

-    }

-private:

-	// Private properties

-	QString ProgramName;

-	QLibrary FSUIPCLib;

-	QString LocationOfDLL;

-	float prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;

-

-	static int scale2AnalogLimits( float x, float min_x, float max_x );

-	void loadSettings();

-};

-

-// Widget that has controls for FTNoIR protocol client-settings.

-class FSUIPCControls: public QWidget, public IProtocolDialog

-{

-    Q_OBJECT

-public:

-

-	explicit FSUIPCControls();

-    virtual ~FSUIPCControls();

-	void showEvent ( QShowEvent * event );

-    void Initialize(QWidget *parent);

-	void registerProtocol(IProtocol *protocol) {

-		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol

-	}

-	void unRegisterProtocol() {

-		theProtocol = NULL;									// Reset the pointer

-	}

-

-private:

-	Ui::UICFSUIPCControls ui;

-	void loadSettings();

-	void save();

-

-	/** helper **/

-	bool settingsDirty;

-	FTNoIR_Protocol *theProtocol;

-

-private slots:

-	void doOK();

-	void doCancel();

-	void settingChanged() { settingsDirty = true; };

-	void getLocationOfDLL();

-};

-

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

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

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

-class FTNoIR_ProtocolDll : public Metadata

-{

-public:

-	FTNoIR_ProtocolDll();

-	~FTNoIR_ProtocolDll();

-

-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FS2002/FS2004"); };

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

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Microsoft FS2004 protocol"); };

-

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

-};

-

-

-#endif//INCLUDED_FSUIPCSERVER_H

-//END

+/********************************************************************************
+* 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) 2010-2011	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/>.				*
+*																				*
+* FSUIPCServer		FSUIPCServer is the Class, that communicates headpose-data	*
+*					to games, using the FSUIPC.dll.			         			*
+********************************************************************************/
+#pragma once
+#ifndef INCLUDED_FSUIPCSERVER_H
+#define INCLUDED_FSUIPCSERVER_H
+
+#include <windows.h>
+#include <stdlib.h>
+#include "FSUIPC_User.h"
+#include "facetracknoir/global-settings.h"
+#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
+#include "ui_ftnoir_fsuipccontrols.h"
+#include <QMessageBox>
+#include <QSettings>
+#include <QLibrary>
+#include <QProcess>
+#include <QDebug>
+#include <QFile>
+#include <QFileDialog>
+#include "facetracknoir/options.h"
+using namespace options;
+
+#define FSUIPC_FILENAME "C:\\Program Files\\Microsoft Games\\Flight Simulator 9\\Modules\\FSUIPC.dll"
+
+struct settings {
+    pbundle b;
+    value<QString> LocationOfDLL;
+    settings() :
+        b(bundle("proto-fsuipc")),
+        LocationOfDLL(b, "dll-location", FSUIPC_FILENAME)
+    {}
+};
+
+#pragma pack(push,1)		// All fields in structure must be byte aligned.
+typedef struct
+{
+ int Control;				// Control identifier
+ int Value;					// Value of DOF
+} TFSState;
+#pragma pack(pop)
+
+class FTNoIR_Protocol : public IProtocol
+{
+public:
+	FTNoIR_Protocol();
+    virtual ~FTNoIR_Protocol() virt_override;
+    bool checkServerInstallationOK();
+    void sendHeadposeToGame(const double* headpose);
+    QString getGameName() {
+        return "Microsoft Flight Simulator X";
+    }
+private:
+	QLibrary FSUIPCLib;
+    double prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ;
+	static int scale2AnalogLimits( float x, float min_x, float max_x );
+    settings s;
+};
+
+class FSUIPCControls: public QWidget, public IProtocolDialog
+{
+    Q_OBJECT
+public:
+    FSUIPCControls();
+    void registerProtocol(IProtocol *) {}
+    void unRegisterProtocol() {}
+private:
+	Ui::UICFSUIPCControls ui;
+    settings s;
+private slots:
+	void doOK();
+	void doCancel();
+	void getLocationOfDLL();
+};
+
+class FTNoIR_ProtocolDll : public Metadata
+{
+public:
+    void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FS2002/FS2004"); }
+    void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("FSUIPC"); }
+    void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Microsoft FS2004 protocol"); }
+    void getIcon(QIcon *icon) { *icon = QIcon(":/images/fs9.png"); }
+};
+
+
+#endif//INCLUDED_FSUIPCSERVER_H
+//END