From 0948938ea70784b7b0607a709a199d1acefda949 Mon Sep 17 00:00:00 2001 From: Patrick Ruoff Date: Tue, 25 Sep 2012 17:02:38 +0000 Subject: 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 --- FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.cpp | 14 +++++++------- FTNoIR_Protocol_FG/FTNoIR_Protocol_FG.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'FTNoIR_Protocol_FG') 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"); }; -- cgit v1.2.3