diff options
| author | Patrick Ruoff <c14-radioactive@19e81ba0-9b1a-49c3-bd6c-561e1906d5fb> | 2012-09-25 17:02:38 +0000 |
|---|---|---|
| committer | Patrick Ruoff <c14-radioactive@19e81ba0-9b1a-49c3-bd6c-561e1906d5fb> | 2012-09-25 17:02:38 +0000 |
| commit | 0948938ea70784b7b0607a709a199d1acefda949 (patch) | |
| tree | e869eb21d046e1a4f33199471eeb42751d938abf /FTNoIR_Protocol_FTIR | |
| parent | 72d392a3741a854847351d44fa551751ffd9480f (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_FTIR')
| -rw-r--r-- | FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp | 14 | ||||
| -rw-r--r-- | FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp index 399fc012..0c8b2fbf 100644 --- a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp +++ b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.cpp @@ -124,7 +124,7 @@ void FTNoIR_Protocol_FTIR::loadSettings() { //
// Update Headpose in Game.
//
-void FTNoIR_Protocol_FTIR::sendHeadposeToGame( T6DOF *headpose ) {
+void FTNoIR_Protocol_FTIR::sendHeadposeToGame( THeadPoseData *headpose ) {
float virtPosX;
float virtPosY;
float virtPosZ;
@@ -138,13 +138,13 @@ TRACKIRDATA localdata; //
// Copy the Raw measurements directly to the client.
//
- virtRotX = scale2AnalogLimits (headpose->position.pitch, -180.0f, 180.0f);
- virtRotY = scale2AnalogLimits (headpose->position.yaw, -180.0f, 180.0f);
- virtRotZ = scale2AnalogLimits (headpose->position.roll, -180.0f, 180.0f);
+ virtRotX = scale2AnalogLimits (headpose->pitch, -180.0f, 180.0f);
+ virtRotY = scale2AnalogLimits (headpose->yaw, -180.0f, 180.0f);
+ virtRotZ = scale2AnalogLimits (headpose->roll, -180.0f, 180.0f);
- virtPosX = scale2AnalogLimits (headpose->position.x * 10.0f, -500.0f, 500.0f);
- virtPosY = scale2AnalogLimits (headpose->position.y * 10.0f, -500.0f, 500.0f);
- virtPosZ = scale2AnalogLimits (headpose->position.z * 10.0f, -500.0f, 500.0f);
+ virtPosX = scale2AnalogLimits (headpose->x * 10.0f, -500.0f, 500.0f);
+ virtPosY = scale2AnalogLimits (headpose->y * 10.0f, -500.0f, 500.0f);
+ virtPosZ = scale2AnalogLimits (headpose->z * 10.0f, -500.0f, 500.0f);
//
// Check if the pointer is OK and wait for the Mutex.
diff --git a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.h b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.h index 29b16e4b..7478f405 100644 --- a/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.h +++ b/FTNoIR_Protocol_FTIR/FTNoIR_Protocol_FTIR.h @@ -56,7 +56,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("fake TrackIR"); };
|