summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Protocol_PPJOY
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_PPJOY
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_PPJOY')
-rw-r--r--FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp14
-rw-r--r--FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
index bfecfeb3..f533fdf3 100644
--- a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
+++ b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.cpp
@@ -128,7 +128,7 @@ void FTNoIR_Protocol_PPJOY::loadSettings() {
//
// Update Headpose in Game.
//
-void FTNoIR_Protocol_PPJOY::sendHeadposeToGame( T6DOF *headpose ) {
+void FTNoIR_Protocol_PPJOY::sendHeadposeToGame( THeadPoseData *headpose ) {
float virtPosX;
float virtPosY;
float virtPosZ;
@@ -140,13 +140,13 @@ float virtRotZ;
//
// Copy the Raw measurements.
//
- virtRotX = headpose->position.pitch;
- virtRotY = headpose->position.yaw;
- virtRotZ = headpose->position.roll;
+ virtRotX = headpose->pitch;
+ virtRotY = headpose->yaw;
+ virtRotZ = headpose->roll;
- virtPosX = headpose->position.x;
- virtPosY = headpose->position.y;
- virtPosZ = headpose->position.z;
+ virtPosX = headpose->x;
+ virtPosY = headpose->y;
+ virtPosZ = headpose->z;
/* Initialise the IOCTL data structure */
JoyState.Signature= JOYSTICK_STATE_V1;
diff --git a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
index 97f064db..266fd877 100644
--- a/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
+++ b/FTNoIR_Protocol_PPJOY/FTNoIR_Protocol_PPJOY.h
@@ -69,7 +69,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("PPJoy Virtual Joystick"); };