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_FSUIPC/FTNoIR_Protocol_FSUIPC.cpp | 10 +++++----- FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'FTNoIR_Protocol_FSUIPC') diff --git a/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.cpp b/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.cpp index b4d6bebe..c88e7ec0 100644 --- a/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.cpp +++ b/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.cpp @@ -103,7 +103,7 @@ void FTNoIR_Protocol_FSUIPC::loadSettings() { // // Update Headpose in Game. // -void FTNoIR_Protocol_FSUIPC::sendHeadposeToGame( T6DOF *headpose ) { +void FTNoIR_Protocol_FSUIPC::sendHeadposeToGame( THeadPoseData *headpose ) { DWORD result; TFSState pitch; TFSState yaw; @@ -120,13 +120,13 @@ float virtRotZ; // qDebug() << "FSUIPCServer::run() says: started!"; - virtRotX = -1.0f * headpose->position.pitch; // degrees - virtRotY = headpose->position.yaw; - virtRotZ = headpose->position.roll; + virtRotX = -1.0f * headpose->pitch; // degrees + virtRotY = headpose->yaw; + virtRotZ = headpose->roll; virtPosX = 0.0f; // cm, X and Y are not working for FS2002/2004! virtPosY = 0.0f; - virtPosZ = -1.0f * headpose->position.z; + virtPosZ = -1.0f * headpose->z; // // Init. the FSUIPC offsets (derived from Free-track...) diff --git a/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.h b/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.h index 196a107a..15ef9209 100644 --- a/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.h +++ b/FTNoIR_Protocol_FSUIPC/FTNoIR_Protocol_FSUIPC.h @@ -65,7 +65,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("FS2002/FS2004"); }; -- cgit v1.2.3