Removed repository files thats should not be there

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

22 files changed, 60 insertions, 830 deletions

diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index 7b681b96..c8b717cf 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -678,13 +678,13 @@ void FaceTrackNoIR::exit() {
 //

 void FaceTrackNoIR::createIconGroupBox()

 {

-	ui.iconcomboBox->addItem(QIcon("images/Freetrack.ico"), tr("Freetrack"));

-	ui.iconcomboBox->addItem(QIcon("images/FlightGear.ico"), tr("FlightGear"));

-	ui.iconcomboBox->addItem(QIcon("images/FaceTrackNoIR.ico"), tr("FTNoir client"));

-	ui.iconcomboBox->addItem(QIcon("images/PPJoy.ico"), tr("Virtual Joystick"));

+	ui.iconcomboBox->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/Freetrack.ico"), tr("Freetrack"));

+	ui.iconcomboBox->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/FlightGear.ico"), tr("FlightGear"));

+	ui.iconcomboBox->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/FaceTrackNoIR.ico"), tr("FTNoir client"));

+	ui.iconcomboBox->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/PPJoy.ico"), tr("Virtual Joystick"));

 

-	ui.iconcomboTrackerSource->addItem(QIcon("images/SeeingMachines.ico"), tr("Face API"));

-	ui.iconcomboTrackerSource->addItem(QIcon("images/FaceTrackNoIR.ico"), tr("FTNoir server"));

+	ui.iconcomboTrackerSource->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/SeeingMachines.ico"), tr("Face API"));

+	ui.iconcomboTrackerSource->addItem(QIcon(QCoreApplication::applicationDirPath() + "/images/FaceTrackNoIR.ico"), tr("FTNoir server"));

 }

 

 //

@@ -720,7 +720,7 @@ void FaceTrackNoIR::createTrayIcon()
     trayIcon = new QSystemTrayIcon(this);

     trayIcon->setContextMenu(trayIconMenu);

 

-    trayIcon->setIcon(QIcon("images/FaceTrackNoIR.ico"));

+    trayIcon->setIcon(QIcon(QCoreApplication::applicationDirPath() + "/images/FaceTrackNoIR.ico"));

 }

 

 //

@@ -730,7 +730,7 @@ void FaceTrackNoIR::setIcon(int index)
 {

     QIcon icon = ui.iconcomboBox->itemIcon(index);

     trayIcon->setIcon(icon);

-    setWindowIcon(QIcon("images/FaceTrackNoIR.ico"));

+    setWindowIcon(QIcon(QCoreApplication::applicationDirPath() + "/images/FaceTrackNoIR.ico"));

 

     trayIcon->setToolTip(ui.iconcomboBox->itemText(index));

 	settingsDirty = true;

diff --git a/FaceTrackNoIR/Readme_Update_20100615.txt b/FaceTrackNoIR/Readme_Update_20100615.txt
new file mode 100644
index 00000000..e43d954c
--- /dev/null
+++ b/FaceTrackNoIR/Readme_Update_20100615.txt
@@ -0,0 +1,51 @@
+FaceTrackNoIR (v. 20100615).

+

+From various users we received requests for improvements and features. If you keep sending us your ideas, we can keep

+improving FaceTrackNoIR...

+

+Installation:

+Unzip the .exe to the installation folder of FaceTrackNoIR (best rename the old .exe first). The folders in the ZIP-file

+contain support info and examples of a .INI-file (IL-2) and a script for GlovePIE.

+

+

+The following upgrades have been applied:

+

+-	‘=’ is center view 

+

+-	‘BACKSPACE’ = start (+center)/stop tracking. A messagebeep is generated when tracking is resumed and the

+		      headpose-data is valid again (faceAPI has 'locked on'... ).

+	

+-	Checkbox ‘use EWMA filter’: Ticking this checkbox will make FaceTrackNoIR filter the headpose data with

+	a so-called 'Exponentially Weighed Moving Average'. This technique was adopted from FlightGear, where

+	Melchior Franz had 'invented' it. 

+	If the filter is active, the factor for each of the 6 DOF's are used. These factors determine the weight that is 

+	given to previous measurements and goes from 0 - 1 (in the GUI this setting is 0 - 100). A lower value will give a 	quicker response (but less stable).

+

+	Remark: for FlightGear, the EWMA checkbox does nothing: the filter is embedded in the FlightGear script.

+

+-	Some timing-issues with the faceAPI were resolved, so now the scanning-frequency can be higher that 20Hz.

+	We do not know yet, how this influences performance of both FaceTrackNoIR and your CPU. Experience learns, that

+	the headtracking is influenced by many factors, like CPU, video-card, framerate of the game etc.

+

+-	The protocol-server that is selected in the combobox is now the only one that is started, when the tracker is started.

+	Before loading an .INI-file, please stop the tracker.

+

+-	PPJoy support is added, so now FaceTrackNoIR can be used for other games too. We tested this feature with IL-2,

+	using GlovePIE to generate TrackIR data. Check out the files in the ZIP-file for instructions. PPjoy was created by

+	Deon van der Westhuysen and GlovePIE by Carl Kenner. We thank them both for their effort!

+

+

+

+Please let us know what you think of our little gadget. Posts can be made on the FaceTrackNoIR forum on SourceForge 

+(http://sourceforge.net/projects/facetracknoir/forums/forum/1150910) or on the various game-forums.

+

+If anyone has used FaceTrackNoIR successfully with other games, please let us know. If you can, we would also like to receive

+examples of the .INI-file you used for that and maybe settings of other utilities needed. Thanks!

+

+

+

+The FaceTrackNoIR team:

+

+Wim Vriend

+Ron Hendriks

+

diff --git a/FaceTrackNoIR/Readme_Upgrade_20100607.txt b/FaceTrackNoIR/Readme_Upgrade_20100607.txt
deleted file mode 100644
index fb7a4ac9..00000000
--- a/FaceTrackNoIR/Readme_Upgrade_20100607.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-FaceTrackNoIR (v. 1.0.1).

-

-The following upgrades have been applied:

-

-	‘=’ is center view 

-

-	‘BACKSPACE’ = start (+center)/stop tracking. A messagebeep is generated when tracking is resumed and the

-		      headpose-data is valid again (faceAPI has 'locked on'... 

-	

-	Checkbox ‘use EWMA filter’: Ticking this checkbox will make FaceTrackNoIR filter the raw data with

-	a so-called 'Exponentially Weighed Moving Average'. This technique was adopted from FlightGear, where

-	Melchior Franz had 'invented' it. If the filter is active, the factor for each of the 6 DOF's are used.

-	These factor determine the weight that is given to previous measurements and goes from 0 - 1 (in the GUI

-	this setting is 0 - 100).

-

-	Some timing-issues with the faceAPI were resolved, so now the scanning-frequency can be higher that 20Hz.

-	We do not know yet, how this influences performance of both FaceTrackNoIR and your CPU.

-

-

-

-Please let us know what you think of our little gadget. Posts can be made on the FaceTrackNoIR forum on SourceForge 

-(http://sourceforge.net/projects/facetracknoir/forums/forum/1150910) or on the various game-forums.

-

-

-

-The FaceTrackNoIR team:

-

-Wim Vriend

-Ron Hendriks

-

diff --git a/FaceTrackNoIR/Release/BuildLog.htm b/FaceTrackNoIR/Release/BuildLog.htm
index c0e93c6e..35239261 100644
--- a/FaceTrackNoIR/Release/BuildLog.htm
+++ b/FaceTrackNoIR/Release/BuildLog.htm
diff --git a/FaceTrackNoIR/Release/FGServer.obj b/FaceTrackNoIR/Release/FGServer.obj
deleted file mode 100644
index c1189299..00000000
--- a/FaceTrackNoIR/Release/FGServer.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/FTServer.obj b/FaceTrackNoIR/Release/FTServer.obj
deleted file mode 100644
index 68574568..00000000
--- a/FaceTrackNoIR/Release/FTServer.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/FTTypes.obj b/FaceTrackNoIR/Release/FTTypes.obj
deleted file mode 100644
index a0af9fed..00000000
--- a/FaceTrackNoIR/Release/FTTypes.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/FaceApp.obj b/FaceTrackNoIR/Release/FaceApp.obj
deleted file mode 100644
index c5d5a9e4..00000000
--- a/FaceTrackNoIR/Release/FaceApp.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/FaceTrackNoIR.obj b/FaceTrackNoIR/Release/FaceTrackNoIR.obj
deleted file mode 100644
index 3c1d59bf..00000000
--- a/FaceTrackNoIR/Release/FaceTrackNoIR.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/main.obj b/FaceTrackNoIR/Release/main.obj
deleted file mode 100644
index 5d8e5ce0..00000000
--- a/FaceTrackNoIR/Release/main.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/moc_FGServer.obj b/FaceTrackNoIR/Release/moc_FGServer.obj
deleted file mode 100644
index 29b414a6..00000000
--- a/FaceTrackNoIR/Release/moc_FGServer.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/moc_FTServer.obj b/FaceTrackNoIR/Release/moc_FTServer.obj
deleted file mode 100644
index 4faa6876..00000000
--- a/FaceTrackNoIR/Release/moc_FTServer.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/moc_FaceApp.obj b/FaceTrackNoIR/Release/moc_FaceApp.obj
deleted file mode 100644
index 2e13f0a8..00000000
--- a/FaceTrackNoIR/Release/moc_FaceApp.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj b/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj
deleted file mode 100644
index b9dfed7e..00000000
--- a/FaceTrackNoIR/Release/moc_FaceTrackNoIR.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/moc_tracker.obj b/FaceTrackNoIR/Release/moc_tracker.obj
deleted file mode 100644
index e2db08f7..00000000
--- a/FaceTrackNoIR/Release/moc_tracker.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/mt.dep b/FaceTrackNoIR/Release/mt.dep
index 007f0065..da1401d7 100644
--- a/FaceTrackNoIR/Release/mt.dep
+++ b/FaceTrackNoIR/Release/mt.dep
@@ -1 +1 @@
-Manifest resource last updated at 21:54:51.48 on ma 14-06-2010 

+Manifest resource last updated at 21:14:55.58 on di 15-06-2010 

diff --git a/FaceTrackNoIR/Release/qrc_FaceTrackNoIR.obj b/FaceTrackNoIR/Release/qrc_FaceTrackNoIR.obj
deleted file mode 100644
index 1a48d447..00000000
--- a/FaceTrackNoIR/Release/qrc_FaceTrackNoIR.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/tracker.obj b/FaceTrackNoIR/Release/tracker.obj
deleted file mode 100644
index a50afb5f..00000000
--- a/FaceTrackNoIR/Release/tracker.obj
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/vc90.idb b/FaceTrackNoIR/Release/vc90.idb
deleted file mode 100644
index ff531241..00000000
--- a/FaceTrackNoIR/Release/vc90.idb
+++ /dev/null
diff --git a/FaceTrackNoIR/Release/vc90.pdb b/FaceTrackNoIR/Release/vc90.pdb
deleted file mode 100644
index 3bb5b6da..00000000
--- a/FaceTrackNoIR/Release/vc90.pdb
+++ /dev/null
diff --git a/FaceTrackNoIR/TrackIR.cpp b/FaceTrackNoIR/TrackIR.cpp
deleted file mode 100644
index 44adca21..00000000
--- a/FaceTrackNoIR/TrackIR.cpp
+++ /dev/null
@@ -1,745 +0,0 @@
-//**********************************************************************

-//	Filename:	TrackIR.c

-//	Authors:	Wolfram "Osram" Kuss (original)

-//				Lukas "Retro" Friembichler (adapted for EECH)

-//	Date:		26. Feb 2003

-//				26/09/03 adapted for falcon - SHOCK, HORROR, FALCONEERS GET (TWICE !!!) RECYCLED STUFF... EEEEK

-//	Update:

-//

-//	Description:Implements TrackIR support for EECH

-//				Commented code is from the (C++) MiG/BoB Version..

-//				This file was originally split into 2, with the API

-//				originally written by

-//				Doyle Nickless -- 13 Jan, 2003 -- for Eye Control Technology.

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

-#include "stdhdr.h"

-

-#include "TrackIR.h"

-#include "OTWDrive.h"

-#include "sinput.h"

-

-//#define DEBUG_TRACKIR_STUFF 0

-

-// Retro 02/10/03

-//	enable TIR globally (tell the app to try and init it,

-//	is also a status flag if init is succesful)

-bool g_bEnableTrackIR = false;

-bool g_bTrackIRon = false;

-

-/* config vars declared in f4config.cpp */

-extern int g_nTrackIRSampleFreq;

-extern float g_fTIR2DYawPercentage;

-extern float g_fTIR2DPitchPercentage;

-

-// FIRST PART (originally NPClientWraps.c)

-

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

-// *

-// * Module Name:

-// *   NPClientWraps.cpp

-// *

-// * Software Engineer:

-// *   Doyle Nickless - GoFlight Inc., for Eye Control Technology.

-// *

-// * Abstract:

-// *   This module implements the wrapper code for interfacing to the NaturalPoint

-// *   Game Client API.  Developers of client apps can include this module into

-// *   their projects to simplify communication with the NaturalPoint software.

-// *

-// *   This is necessary since the NPClient DLL is run-time linked rather than

-// *   load-time linked, avoiding the need to link a static library into the

-// *   client program (only this module is needed, and can be supplied in source

-// *   form.)

-// *

-// * Environment:

-// *   User mode

-// *

-// * Update:	Retro, Feb 2003 - Threw out the MFC stuff, made it compile in C

-// *			Mostly messed around in NPClient_Init() though..

-// *

-// *			Retro 26/09/03 - moved to FalconLand =)

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

-

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

-/// Defines //////////////////////////////////////////////////////////////////////

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

-#define         VERSION_MAJOR           1

-#define         VERSION_MINOR           0

-#define         VERSION_BUILD           1

-

-// magic to get the preprocessor to do what we want

-#define		lita(arg) #arg

-#define		xlita(arg) lita(arg)

-#define		cat3(w,x,z) w##.##x##.##z##\000

-#define		xcat3(w,x,z) cat3(w,x,z)

-#define		VERSION_STRING xlita(xcat3(VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD))

-

-//

-// Versioning hasn't been worked out yet...

-//

-// The following is the previous spec definition of versioning info -- I can probably do

-// something very similar to this -- will keep you posted.

-//

-// request version information using 2 messages, they cannot be expected to arrive in a specific order - so always parse using the High byte

-// the messages have a NPCONTROL byte in the first parameter, and the second parameter has packed bytes.

-//   Message 1) (first parameter)NPCONTROL : (second parameter) (High Byte)NPVERSIONMAJOR (Low Byte) major version number data

-//   Message 2) (first parameter)NPCONTROL : (second parameter) (High Byte)NPVERSIONMINOR (Low Byte) minor version number data

-

-#define	NPQUERYVERSION	1040

-

-// CONTROL DATA SUBFIELDS

-#define	NPVERSIONMAJOR	1

-#define	NPVERSIONMINOR	2

-

-// DATA FIELDS

-#define	NPControl		8	// indicates a control data field

-						// the second parameter of a message bearing control data information contains a packed data format. 

-						// The High byte indicates what the data is, and the Low byte contains the actual data

-// roll, pitch, yaw

-#define	NPRoll		1	// +/- 16383 (representing +/- 180) [data = input - 16383]

-#define	NPPitch		2	// +/- 16383 (representing +/- 180) [data = input - 16383]

-#define	NPYaw		4	// +/- 16383 (representing +/- 180) [data = input - 16383]

-

-// x, y, z - remaining 6dof coordinates

-#define	NPX			16	// +/- 16383 [data = input - 16383]

-#define	NPY			32	// +/- 16383 [data = input - 16383]

-#define	NPZ			64	// +/- 16383 [data = input - 16383]

-

-// raw object position from imager

-#define	NPRawX		128	// 0..25600 (actual value is multiplied x 100 to pass two decimal places of precision)  [data = input / 100]

-#define	NPRawY		256  // 0..25600 (actual value is multiplied x 100 to pass two decimal places of precision)  [data = input / 100]

-#define	NPRawZ		512  // 0..25600 (actual value is multiplied x 100 to pass two decimal places of precision)  [data = input / 100]

-

-// x, y, z deltas from raw imager position 

-#define	NPDeltaX		1024 // +/- 2560 (actual value is multiplied x 10 to pass two decimal places of precision)  [data = (input / 10) - 256]

-#define	NPDeltaY		2048 // +/- 2560 (actual value is multiplied x 10 to pass two decimal places of precision)  [data = (input / 10) - 256]

-#define	NPDeltaZ		4096 // +/- 2560 (actual value is multiplied x 10 to pass two decimal places of precision)  [data = (input / 10) - 256]

-

-// raw object position from imager

-#define	NPSmoothX		8192	  // 0..32766 (actual value is multiplied x 10 to pass one decimal place of precision) [data = input / 10]

-#define	NPSmoothY		16384  // 0..32766 (actual value is multiplied x 10 to pass one decimal place of precision) [data = input / 10]

-#define	NPSmoothZ		32768  // 0..32766 (actual value is multiplied x 10 to pass one decimal place of precision) [data = input / 10]

-

-

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

-/// Typedefs /////////////////////////////////////////////////////////////////////

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

-

-// NPESULT values are returned from the Game Client API functions.

-//

-typedef enum tagNPResult

-{

-	NP_OK = 0,

-    NP_ERR_DEVICE_NOT_PRESENT,

-	NP_ERR_UNSUPPORTED_OS,

-	NP_ERR_INVALID_ARG,

-	NP_ERR_DLL_NOT_FOUND,

-	NP_ERR_NO_DATA,

-	NP_ERR_INTERNAL_DATA

-} NPRESULT;

-

-typedef struct tagTrackIRData

-{

-	unsigned short wNPStatus;

-	unsigned short wPFrameSignature;

-	unsigned long  dwNPIOData;

-

-	float fNPRoll;

-	float fNPPitch;

-	float fNPYaw;

-	float fNPX;

-	float fNPY;

-	float fNPZ;

-	float fNPRawX;

-	float fNPRawY;

-	float fNPRawZ;

-	float fNPDeltaX;

-	float fNPDeltaY;

-	float fNPDeltaZ;

-	float fNPSmoothX;

-	float fNPSmoothY;

-	float fNPSmoothZ;

-

-} TRACKIRDATA, *LPTRACKIRDATA;

-

-//

-// Typedef for pointer to the notify callback function that is implemented within

-// the client -- this function receives head tracker reports from the game client API

-//

-typedef NPRESULT (__stdcall *PF_NOTIFYCALLBACK)( unsigned short, unsigned short );

-

-// Typedefs for game client API functions (useful for declaring pointers to these

-// functions within the client for use during GetProcAddress() ops)

-//

-typedef NPRESULT (__stdcall *PF_NP_REGISTERWINDOWHANDLE)( HWND );

-typedef NPRESULT (__stdcall *PF_NP_UNREGISTERWINDOWHANDLE)( void );

-typedef NPRESULT (__stdcall *PF_NP_REGISTERPROGRAMPROFILEID)( unsigned short );

-typedef NPRESULT (__stdcall *PF_NP_QUERYVERSION)( unsigned short* );

-typedef NPRESULT (__stdcall *PF_NP_REQUESTDATA)( unsigned short );

-typedef NPRESULT (__stdcall *PF_NP_GETDATA)( LPTRACKIRDATA );

-typedef NPRESULT (__stdcall *PF_NP_REGISTERNOTIFY)( PF_NOTIFYCALLBACK );

-typedef NPRESULT (__stdcall *PF_NP_UNREGISTERNOTIFY)( void );

-typedef NPRESULT (__stdcall *PF_NP_STARTCURSOR)( void );

-typedef NPRESULT (__stdcall *PF_NP_STOPCURSOR)( void );

-typedef NPRESULT (__stdcall *PF_NP_STARTDATATRANSMISSION)( void );

-typedef NPRESULT (__stdcall *PF_NP_STOPDATATRANSMISSION)( void );

-

-//// Function Prototypes ///////////////////////////////////////////////

-//

-// Functions exported from game client API DLL ( note __stdcall calling convention

-// is used for ease of interface to clients of differing implementations including

-// C, C++, Pascal (Delphi) and VB. )

-//

-//NPRESULT __stdcall NP_RegisterWindowHandle( HWND hWnd );

-NPRESULT __stdcall NP_RegisterWindowHandle( HWND );

-NPRESULT __stdcall NP_UnregisterWindowHandle( void );

-NPRESULT __stdcall NP_RegisterProgramProfileID( unsigned short wPPID );

-NPRESULT __stdcall NP_QueryVersion( unsigned short* pwVersion );

-NPRESULT __stdcall NP_RequestData( unsigned short wDataReq );

-NPRESULT __stdcall NP_GetData( LPTRACKIRDATA pTID );

-NPRESULT __stdcall NP_RegisterNotify( PF_NOTIFYCALLBACK pfNotify );

-NPRESULT __stdcall NP_UnregisterNotify( void );

-NPRESULT __stdcall NP_StartCursor( void );

-NPRESULT __stdcall NP_StopCursor( void );

-NPRESULT __stdcall NP_StartDataTransmission( void );

-NPRESULT __stdcall NP_StopDataTransmission( void );

-

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

-// Defines ///////////////////////////////////////////////////////////////////////

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

-//

-

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

-// Global Data ///////////////////////////////////////////////////////////////////

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

-//

-PF_NP_REGISTERWINDOWHANDLE       gpfNP_RegisterWindowHandle = NULL;

-PF_NP_UNREGISTERWINDOWHANDLE     gpfNP_UnregisterWindowHandle = NULL;

-PF_NP_REGISTERPROGRAMPROFILEID   gpfNP_RegisterProgramProfileID = NULL;

-PF_NP_QUERYVERSION               gpfNP_QueryVersion = NULL;

-PF_NP_REQUESTDATA                gpfNP_RequestData = NULL;

-PF_NP_GETDATA                    gpfNP_GetData = NULL;

-PF_NP_STARTCURSOR                gpfNP_StartCursor = NULL;

-PF_NP_STOPCURSOR                 gpfNP_StopCursor = NULL;

-PF_NP_STARTDATATRANSMISSION      gpfNP_StartDataTransmission = NULL;

-PF_NP_STOPDATATRANSMISSION       gpfNP_StopDataTransmission = NULL;

-

-HMODULE ghNPClientDLL = (HMODULE)NULL;

-

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

-// NaturalPoint Game Client API function wrappers /////////////////////////////

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

-//

-NPRESULT __stdcall NP_RegisterWindowHandle( HWND hWnd  )

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_RegisterWindowHandle )

-		result = (*gpfNP_RegisterWindowHandle)( hWnd );

-

-	return result;

-} // NP_RegisterWindowHandle()

-

-

-NPRESULT __stdcall NP_UnregisterWindowHandle()

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_UnregisterWindowHandle )

-		result = (*gpfNP_UnregisterWindowHandle)();

-

-	return result;

-} // NP_UnregisterWindowHandle()

-

-

-NPRESULT __stdcall NP_RegisterProgramProfileID( unsigned short wPPID )

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_RegisterProgramProfileID )

-		result = (*gpfNP_RegisterProgramProfileID)( wPPID );

-

-	return result;

-} // NP_RegisterProgramProfileID()

-

-

-NPRESULT __stdcall NP_QueryVersion( unsigned short* pwVersion )

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_QueryVersion )

-		result = (*gpfNP_QueryVersion)( pwVersion );

-

-	return result;

-} // NP_QueryVersion()

-

-

-NPRESULT __stdcall NP_RequestData( unsigned short wDataReq )

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_RequestData )

-		result = (*gpfNP_RequestData)( wDataReq );

-

-	return result;

-} // NP_RequestData()

-

-

-NPRESULT __stdcall NP_GetData( LPTRACKIRDATA pTID )

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_GetData )

-		result = (*gpfNP_GetData)( pTID );

-

-	return result;

-} // NP_GetData()

-

-

-NPRESULT __stdcall NP_StartCursor()

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_StartCursor )

-		result = (*gpfNP_StartCursor)();

-

-	return result;

-} // NP_StartCursor()

-

-

-NPRESULT __stdcall NP_StopCursor()

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_StopCursor )

-		result = (*gpfNP_StopCursor)();

-

-	return result;

-} // NP_StopCursor()

-

-

-NPRESULT __stdcall NP_StartDataTransmission()

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_StartDataTransmission )

-		result = (*gpfNP_StartDataTransmission)();

-

-	return result;

-} // NP_StartDataTransmission()

-

-

-NPRESULT __stdcall NP_StopDataTransmission()

-{

-	NPRESULT result = NP_ERR_DLL_NOT_FOUND;

-

-	if( NULL != gpfNP_StopDataTransmission )

-		result = (*gpfNP_StopDataTransmission)();

-

-	return result;

-} // NP_StopDataTransmission()

-

-

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

-// NPClientInit() -- Loads the DLL and retrieves pointers to all exports

-//

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

-//	Name:		NPClient_Init

-//	Authors:	Retro

-//	Date:		26. Feb 2003

-//	Update:

-//

-//	Description:Made it work in C, some horrible code there I guess..

-//				There´s a 200byte mem-leak here too...

-//

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

-NPRESULT NPClient_Init( char* csDLLPath )

-{

-

-	NPRESULT result = NP_OK;

-

-	char csNPClientDLLFullPath[1024];

-

-	strcpy(csNPClientDLLFullPath,csDLLPath);

-	strcat(csNPClientDLLFullPath,"NPClient.dll");

-

-	ghNPClientDLL = LoadLibrary( csNPClientDLLFullPath );

-	if( NULL != ghNPClientDLL )

-		{

-		// Get addresses of all exported functions

-		gpfNP_RegisterWindowHandle     = (PF_NP_REGISTERWINDOWHANDLE)GetProcAddress( ghNPClientDLL, "NP_RegisterWindowHandle" );

-		gpfNP_UnregisterWindowHandle   = (PF_NP_UNREGISTERWINDOWHANDLE)GetProcAddress( ghNPClientDLL, "NP_UnregisterWindowHandle" );

-		gpfNP_RegisterProgramProfileID = (PF_NP_REGISTERPROGRAMPROFILEID)GetProcAddress( ghNPClientDLL, "NP_RegisterProgramProfileID" );

-		gpfNP_QueryVersion             = (PF_NP_QUERYVERSION)GetProcAddress( ghNPClientDLL, "NP_QueryVersion" );

-		gpfNP_RequestData              = (PF_NP_REQUESTDATA)GetProcAddress( ghNPClientDLL, "NP_RequestData" );

-		gpfNP_GetData                  = (PF_NP_GETDATA)GetProcAddress( ghNPClientDLL, "NP_GetData" );

-		gpfNP_StartCursor              = (PF_NP_STARTCURSOR)GetProcAddress( ghNPClientDLL, "NP_StartCursor" );

-		gpfNP_StopCursor               = (PF_NP_STOPCURSOR)GetProcAddress( ghNPClientDLL, "NP_StopCursor" );

-		gpfNP_StartDataTransmission    = (PF_NP_STARTDATATRANSMISSION)GetProcAddress( ghNPClientDLL, "NP_StartDataTransmission" );

-		gpfNP_StopDataTransmission     = (PF_NP_STOPDATATRANSMISSION)GetProcAddress( ghNPClientDLL, "NP_StopDataTransmission" );

-

-	}

-	else

-		result = NP_ERR_DLL_NOT_FOUND;

-

-	return result;

-

-} // NPClient_Init()

-

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

-

-char* gcsDLLPath;

-

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

-// Function:    TrackIR_2D_Map

-// Date:		26.9.2003

-// Author:		Retro

-//

-//	Is this code legal ?

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

-int TrackIR::TrackIR_2D_Map()

-{

-

-	if (!panningAllowed)

-		return -1;

-

-	TRACKIRDATA tid;

-

-	if( NP_OK == NP_GetData( &tid ))

-	{

-		// xpos, ypos are in the -16383... +16383 range

-		int xpos = (int)tid.fNPYaw;

-		int ypos = (int)tid.fNPPitch;

-

-		int retval = 0;

-

-		if (xpos > Pit_2d_Yaw)				// left

-		{

-			retval = POV_W;

-		}

-		else if (xpos > -Pit_2d_Yaw)		// middle

-		{

-			if (ypos > Pit_2d_Pitch)		// down

-				retval = POV_S;

-			else if (ypos > -Pit_2d_Pitch)	// middle

-				retval = -1;

-			else							// up

-				retval = POV_N;

-		}

-		else								// right

-		{

-			retval = POV_E;

-		}

-

-		panningAllowed = false;

-	

-#ifdef DEBUG_TRACKIR_STUFF

-		FILE* fp = fopen("TIR_Debug.txt","at");

-		fprintf(fp,"Yaw %f\t Pitch %f\t retval %i\n",tid.fNPYaw,tid.fNPPitch,retval);

-		fclose(fp);

-#endif

-		return retval;

-	}

-

-	panningAllowed = false;

-

-	return -1;

-}

-

-void TrackIR::Poll()

-{

-	TRACKIRDATA tid;

-

-	if( NP_OK == NP_GetData( &tid ))

-	{

-		if (FrameSignature != tid.wPFrameSignature)

-		{

-			yaw = -tid.fNPYaw / 16383.f * PI;		// yaw is +-180 (PI) degrees

-			pitch = tid.fNPPitch / 16383.f * PI;	// see below for limit

-			roll = tid.fNPRoll / 16383.f * PI / 2;	// +-90.. bad enough imnsho

-			x = tid.fNPX;

-			y = tid.fNPY;

-			z = tid.fNPZ;

-			

-			if (pitch >= PI/4)	// limit to -45 deg

-			{

-				pitch = PI/4;

-			}

-			else if (pitch <= - 0.75f * PI)	// limit to 135deg

-			{

-				pitch = - 0.75f*PI;

-			}

-

-			missedFrameCount = 0;

-			if (isActive == false)

-			{

-				OTWDriver.SetHeadTracking(TRUE);	// Retro 26/09/03

-				isActive = true;

-			}

-

-			FrameSignature = tid.wPFrameSignature;

-		}

-		else

-		{

-			missedFrameCount++;

-			if (missedFrameCount > 100)

-			{

-				isActive = false;

-				OTWDriver.SetHeadTracking(FALSE);	// Retro 26/09/03

-			}

-		}

-	}

-}

-

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

-// Function:    GetTrackIR_ViewValues

-// Date:		26.9.2003

-// Author:		Retro

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

-void TrackIR::GetTrackIR_ViewValues(float* yaw, float* pitch)

-{

-	TRACKIRDATA tid;

-

-	if( NP_OK == NP_GetData( &tid ))

-	{

-		if (FrameSignature != tid.wPFrameSignature)

-		{

-			*yaw = 	-tid.fNPYaw/16383.f*PI;		// yaw is +-180 (PI) degrees

-

-			*pitch = tid.fNPPitch/16383.f*PI;	// we limit pitch to +90 (PI/2) and -45 (PI/4) degrees

-			if (*pitch >= PI/4)	// limit to -45 deg

-			{

-				*pitch = PI/4;

-			}

-/*			else if (*pitch <= -PI/2)// limit to 90 deg

-			{

-				*pitch = -PI/2;

-			}

-*/			else if (*pitch <= - 0.75f*PI)	// limit to 135deg

-			{

-				*pitch = - 0.75f*PI;

-			}

-

-			missedFrameCount = 0;

-			if ((isActive == false) && (g_bTrackIRon))

-			{

-				OTWDriver.SetHeadTracking(TRUE);	// Retro 26/09/03

-				isActive = true;

-			}

-

-			FrameSignature = tid.wPFrameSignature;

-

-#ifdef DEBUG_TRACKIR_STUFF

-			FILE* fp = fopen("TIR_Debug.txt","at");

-			fprintf(fp,"Yaw %f\t Pitch %f\n",tid.fNPYaw,tid.fNPPitch);

-			fprintf(fp,"Yaw %f\t Pitch %f\n",*yaw,*pitch);

-			fclose(fp);

-#endif

-		}

-		else

-		{

-			missedFrameCount++;

-			if (missedFrameCount > 100)

-			{

-				isActive = false;

-				OTWDriver.SetHeadTracking(FALSE);	// Retro 26/09/03

-			}

-#ifdef DEBUG_TRACKIR_STUFF

-			FILE* fp = fopen("TIR_Debug.txt","at");

-			fprintf(fp,"Missed frame # %i, FrameSig %i, NPFrameSig %i\n",missedFrameCount,FrameSignature,tid.wPFrameSignature);

-			fclose(fp);

-#endif

-			// yaw and pitch values stay unchanged so that looking via POV hat works

-		}

-	}

-}

-

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

-//	Name:		GetDllLocation

-//	Authors:	wk, Retro

-//	Date:		26. Feb 2003

-//	Update:

-//

-//	Description:Look in the registry for the path to the NPClient.dll..

-//				Taken form the NaturalPoint sample code

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

-char* GetDllLocation(char* loc)

-{

-	unsigned char *szValue;

-	char* retval = NULL;

-	DWORD dwSize;

-	HKEY pKey = NULL;

-

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

-	//open the registry key 

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

-	if (RegOpenKeyEx(	HKEY_CURRENT_USER,

-						"Software\\NaturalPoint\\NATURALPOINT\\NPClient Location",

-						0,

-						KEY_READ,

-						&pKey) != ERROR_SUCCESS)

-	{

-		//error condition

-

-		return NULL;

-	}

-

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

-	//get the value from the key

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

-	if (!pKey)

-		return NULL;

-

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

-	//first discover the size of the value

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

-	if (RegQueryValueEx(pKey, "Path", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS)

-	{

-		//allocate memory for the buffer for the value

-		szValue = (unsigned char *)malloc(dwSize);

-		if (szValue != NULL)

-		{

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

-			//now get the value

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

-			if (RegQueryValueEx(pKey, "Path", NULL, NULL, szValue, &dwSize) == ERROR_SUCCESS)

-			{

-				//everything worked

-//				RegCloseKey(pKey);

-		 

-				retval = (char*)szValue;

-			}

-		}	

-	}

-	

-	RegCloseKey(pKey);

-	

-	return retval;

-}

-

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

-// Spiffy Macro by wk that retro crippled in order to work in C

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

-#define TEST_RESULT(a, b)       \

-{ if(NP_OK != b)                \

-	{	/*::MessageBox(0, a, "", 0);*/\

-		return;                     \

-	}                             \

-}

-

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

-//	Name:		InitTrackIR

-//	Authors:	wk, Retro

-//	Date:		26. Feb 2003

-//	Update:

-//

-//	Description:Hook up the NaturalPoint game client DLL using the wrapper module

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

-void TrackIR::InitTrackIR(HWND application_window)

-{

-	unsigned short wNPClientVer;

-	unsigned int DataFields;

-	int TIRVersionMajor = -1, TIRVersionMinor = -1;	// not used anyway

-	NPRESULT result;

-

-#ifdef DEBUG_TRACKIR_STUFF

-	FILE* fp = fopen("TIR_Debug.txt","at");

-	fprintf(fp,"Initializing at startup...\n");

-	if (g_bEnableTrackIR)

-		fprintf(fp,"..with g_bEnableTrackIR ENABLED (of course.. :p)\n");

-	//if (g_bTrackIR2DCockpit)

-	//{

-	//	fprintf(fp,"Freq %i Yaw %i Pitch %i\n",	g_nTrackIRSampleFreq/2,

-	//											(int)(g_fTIR2DYawPercentage*(float)16383),

-	//											(int)(g_fTIR2DPitchPercentage*(float)16383));

-	//}

-	fclose(fp);

-#endif

-

-	g_bEnableTrackIR = false;	// only gets set back to TRUE if init succeeds..

-	g_bTrackIRon = false;

-

-	HWND HandleGame = application_window;

-

-	gcsDLLPath = GetDllLocation(gcsDLLPath);

-	if (!gcsDLLPath)

-		return;

-

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

-	// Initialize the NPClient interface

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

-	TEST_RESULT("NPClient_Init", NPClient_Init(gcsDLLPath))

-

-	free ( gcsDLLPath ); // uuurgh.. does this work ?

-

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

-	// Register the app's window handle

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

-	result = NP_RegisterWindowHandle( HandleGame );

-	if(result != NP_OK) // this happens if the user forgot to start the TrackIR GUI

-	{ 

-		// do any other error output?

-//		::MessageBeep(-1);

-		return;

-	}

-	

-// 2do:	NPRESULT __stdcall 

-	result = NP_RegisterProgramProfileID(1901); // Falcon ID, issued by Halstead York (NP PR Guru)

-

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

-	// Query the NaturalPoint software version

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

-	result = NP_QueryVersion( &wNPClientVer );

-	if( NP_OK == result )

-	{

-		TIRVersionMajor = wNPClientVer >> 8;

-		TIRVersionMinor = wNPClientVer & 0x00FF;

-	}

-

-#ifdef DEBUG_TRACKIR_STUFF

-	fp = fopen("TIR_Debug.txt","at");

-	fprintf(fp,"Version %i.%i\n",TIRVersionMajor,TIRVersionMinor);

-	fclose(fp);

-#endif

-	

-	DataFields = NPPitch | NPYaw | NPRoll | NPX | NPY | NPZ;

-

-	TEST_RESULT( "NP_RequestData", NP_RequestData(DataFields))

-	

-	TEST_RESULT("NP_StopCursor", NP_StopCursor())

-

-	TEST_RESULT( "NP_StartDataTransmission", NP_StartDataTransmission())

-

-	g_bEnableTrackIR = true;					// Retro 26/09/03 - init successful !

-	g_bTrackIRon = true;

-	OTWDriver.SetHeadTracking(TRUE);	// Retro 26/09/03

-

-	if (PlayerOptions.Get2dTrackIR() == true)

-	{

-		g_nTrackIRSampleFreq = g_nTrackIRSampleFreq/2;

-		Pit_2d_Yaw = (int) (g_fTIR2DYawPercentage*(float)16383);

-		Pit_2d_Pitch = (int) (g_fTIR2DPitchPercentage*(float)16383);

-	}

-

-#ifdef DEBUG_TRACKIR_STUFF

-	fp = fopen("TIR_Debug.txt","at");

-	fprintf(fp,"Init Successful !\n");

-	fclose(fp);

-#endif

-}

-

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

-//

-// Function:    ExitTrackIR

-// Date:		23.1.2003

-// Author:		WK

-//

-// Description:		Tells TrackIR we are going...

-//

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

-void TrackIR::ExitTrackIR()

-{

-	NP_StopDataTransmission( );

-	NP_StartCursor( );

-	NP_UnregisterWindowHandle( );

-}

diff --git a/FaceTrackNoIR/TrackIR.h b/FaceTrackNoIR/TrackIR.h
deleted file mode 100644
index 81df17c7..00000000
--- a/FaceTrackNoIR/TrackIR.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Retro 26/09/03

-

-//#define DEBUG_TRACKIR_STUFF

-

-class TrackIR {

-public:

-	TrackIR()

-			{	FrameSignature = missedFrameCount = Pit_2d_Yaw = Pit_2d_Yaw = 0;

-				panningAllowed = isActive = true;

-				yaw = pitch = roll = x = y = z = 0;

-			};

-	~TrackIR() {};

-

-	void InitTrackIR(HWND);

-	void ExitTrackIR();

-

-	void Allow_2D_Panning()		{ panningAllowed = true; }

-	bool Get_Panning_Allowed()	{ return panningAllowed; }

-

-	void GetTrackIR_ViewValues(float*, float*);	// for 3d cockpit panning, gets yaw/pitch values in radians

-	int TrackIR_2D_Map();						// for 2d cockpit panning, returns POV_N, POV_S, POV_E, POV_W values, -1 for neutral

-

-	float getYaw() { return yaw; }

-	float getPitch() { return pitch; }

-	float getRoll() { return roll; }

-	float getX() { return x; }

-	float getY() { return y; }

-	float getZ() { return z;}

-

-	void Poll();

-

-private:

-	unsigned long FrameSignature;

-	unsigned long missedFrameCount;

-

-	bool panningAllowed;

-

-	bool isActive;	// flag indicating if the TIR receives updates.. eg when the user hits F9 (stop TIR) then this one gets false after

-					// a set time of frames (100 for now). This is used to give control back to keyboard/mouse in case tir is switched off

-					// ONLY FOR THE 3d PIT THOUGHT - 2D pit just returns -1 ("don´t pan")

-

-	int Pit_2d_Yaw;

-	int Pit_2d_Pitch;

-

-	float yaw, pitch, roll, x, y, z;

-};