summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Protocol_FG
diff options
context:
space:
mode:
authorPatrick Ruoff <c14-radioactive@19e81ba0-9b1a-49c3-bd6c-561e1906d5fb>2012-09-25 17:02:38 +0000
committerPatrick Ruoff <c14-radioactive@19e81ba0-9b1a-49c3-bd6c-561e1906d5fb>2012-09-25 17:02:38 +0000
commit0948938ea70784b7b0607a709a199d1acefda949 (patch)
treee869eb21d046e1a4f33199471eeb42751d938abf /FTNoIR_Protocol_FG
parent72d392a3741a854847351d44fa551751ffd9480f (diff)
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
Diffstat (limited to 'FTNoIR_Protocol_FG')
-rw-r--r--FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp14
-rw-r--r--FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
index a2a9505a..9234c4d4 100644
--- a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
+++ b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp
@@ -97,7 +97,7 @@ void FTNoIR_Protocol_FG::loadSettings() {
//
// Update Headpose in Game.
//
-void FTNoIR_Protocol_FG::sendHeadposeToGame( T6DOF *headpose ) {
+void FTNoIR_Protocol_FG::sendHeadposeToGame( THeadPoseData *headpose ) {
int no_bytes;
QHostAddress sender;
quint16 senderPort;
@@ -109,12 +109,12 @@ char data[100];
//
// Copy the Raw measurements directly to the client.
//
- FlightData.x = headpose->position.x;
- FlightData.y = headpose->position.y;
- FlightData.z = headpose->position.z;
- FlightData.p = headpose->position.pitch;
- FlightData.h = headpose->position.yaw;
- FlightData.r = headpose->position.roll;
+ FlightData.x = headpose->x;
+ FlightData.y = headpose->y;
+ FlightData.z = headpose->z;
+ FlightData.p = headpose->pitch;
+ FlightData.h = headpose->yaw;
+ FlightData.r = headpose->roll;
FlightData.status = fg_cmd;
//
diff --git a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
index 216095bf..ff3be6bd 100644
--- a/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
+++ b/FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h
@@ -49,7 +49,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("FlightGear"); };