Changed centering algorithm to use proper matrix algebra.

Cleaned up T6DOF structure.
Updated vc_9 project files.


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

2 files changed, 15 insertions, 15 deletions

diff --git a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
index 43326d6a..f4018c2e 100644
--- a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
+++ b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
@@ -78,7 +78,7 @@ void FTNoIR_Protocol_FT::loadSettings() {
 //

 // Update Headpose in Game.

 //

-void FTNoIR_Protocol_FT::sendHeadposeToGame( T6DOF *headpose ) {

+void FTNoIR_Protocol_FT::sendHeadposeToGame( THeadPoseData *headpose ) {

 float virtPosX;

 float virtPosY;

 float virtPosZ;

@@ -101,19 +101,19 @@ PDWORD_PTR MsgResult = 0;
 	//

 	// Scale the Raw measurements to the client measurements.

 	//

-	headRotX = getRadsFromDegrees(headpose->position.pitch);

-	headRotY = getRadsFromDegrees(headpose->position.yaw);

-	headRotZ = getRadsFromDegrees(headpose->position.roll);

-	headPosX = headpose->position.x * 10;

-	headPosY = headpose->position.y * 10;

-	headPosZ = headpose->position.z * 10;

-

-	virtRotX = getRadsFromDegrees(headpose->position.pitch);

-	virtRotY = getRadsFromDegrees(headpose->position.yaw);

-	virtRotZ = getRadsFromDegrees(headpose->position.roll);

-	virtPosX = headpose->position.x * 10;

-	virtPosY = headpose->position.y * 10;

-	virtPosZ = headpose->position.z * 10;

+	headRotX = getRadsFromDegrees(headpose->pitch);

+	headRotY = getRadsFromDegrees(headpose->yaw);

+	headRotZ = getRadsFromDegrees(headpose->roll);

+	headPosX = headpose->x * 10;

+	headPosY = headpose->y * 10;

+	headPosZ = headpose->z * 10;

+

+	virtRotX = getRadsFromDegrees(headpose->pitch);

+	virtRotY = getRadsFromDegrees(headpose->yaw);

+	virtRotZ = getRadsFromDegrees(headpose->roll);

+	virtPosX = headpose->x * 10;

+	virtPosY = headpose->y * 10;

+	virtPosZ = headpose->z * 10;

 

 	//

 	// Check if the pointer is OK and wait for the Mutex.

diff --git a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.h b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.h
index 9d0a5033..736b8600 100644
--- a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.h
+++ b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.h
@@ -52,7 +52,7 @@ public:
     void Initialize();

 

 	bool checkServerInstallationOK( HANDLE handle );

-	void sendHeadposeToGame( T6DOF *headpose );

+	void sendHeadposeToGame( THeadPoseData *headpose );

 	void getNameFromGame( char *dest );					// Take care dest can handle up to 100 chars...

 

 	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("FreeTrack"); };