summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Protocol_FTN
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_FTN
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_FTN')
-rwxr-xr-xFTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.cpp4
-rw-r--r--FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.cpp b/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.cpp
index eb51fb76..55888484 100755
--- a/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.cpp
+++ b/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.cpp
@@ -86,7 +86,7 @@ void FTNoIR_Protocol_FTN::loadSettings() {
//
// Update Headpose in Game.
//
-void FTNoIR_Protocol_FTN::sendHeadposeToGame( T6DOF *headpose ) {
+void FTNoIR_Protocol_FTN::sendHeadposeToGame( THeadPoseData *headpose ) {
int no_bytes;
QHostAddress sender;
quint16 senderPort;
@@ -95,7 +95,7 @@ quint16 senderPort;
// Copy the Raw measurements directly to the client.
//
frame_counter += 1;
- TestData = headpose->position;
+ TestData = *headpose;
TestData.frame_number = frame_counter;
//
diff --git a/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.h b/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.h
index 8f0aa478..b460563c 100644
--- a/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.h
+++ b/FTNoIR_Protocol_FTN/FTNoIR_Protocol_FTN.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("FaceTrackNoIR"); };