From 351e844f6a3c5484acfcf4fb0154bcab6f1780a0 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 13 Apr 2013 05:45:07 +0200
Subject: Don't use axes as class/struct members. Use an array instead, and
 iterate over them where applicable.

---
 ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp | 106 ++++--------------------
 ftnoir_protocol_mouse/ftnoir_protocol_mouse.h   |  14 ++--
 2 files changed, 21 insertions(+), 99 deletions(-)

(limited to 'ftnoir_protocol_mouse')

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index 953482a5..35198cb1 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -106,7 +106,7 @@ void FTNoIR_Protocol::loadSettings() {
 //
 // Update Headpose in Game.
 //
-void FTNoIR_Protocol::sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose ) {
+void FTNoIR_Protocol::sendHeadposeToGame(double *headpose, double *rawheadpose ) {
 float fMouse_X = 0;							// The actual value
 float fMouse_Y = 0;
 float fMouse_Wheel = 0;
@@ -116,103 +116,25 @@ float fMouse_Wheel = 0;
 	// Determine which of the 6DOF's is used.
 	// The rotations are from -180 to +180 and the translations from -50cm to +50cm.
 	// Let's scale the translations to the degrees for simplicity sake...
-	//
-	switch (Mouse_X) {
-		case FTN_PITCH:
-			fMouse_X = headpose->pitch;
-			break;
-
-		case FTN_YAW:
-			fMouse_X = headpose->yaw;
-			break;
-
-		case FTN_ROLL:
-			fMouse_X = headpose->roll;
-			break;
-
-		case FTN_X:
-			fMouse_X = headpose->x * 3.0f;
-			break;
-
-		case FTN_Y:
-			fMouse_X = headpose->y * 3.0f;
-			break;
-
-		case FTN_Z:
-			fMouse_X = headpose->z * 3.0f;
-			break;
-
-		default:
-			break;
-	}
-
-	//
-	// Determine which of the 6DOF's is used.
-	// The rotations are from -180 to +180 and the translations from -50cm to +50cm.
-	// Let's scale the translations to the degrees for simplicity sake...
-	//
-	switch (Mouse_Y) {
-		case FTN_PITCH:
-			fMouse_Y = headpose->pitch;
-			break;
+    //
 
-		case FTN_YAW:
-			fMouse_Y = headpose->yaw;
-			break;
+    if (Mouse_X > 0 && Mouse_X < 6+1)
+        fMouse_X = headpose[Mouse_X-1];
 
-		case FTN_ROLL:
-			fMouse_Y = headpose->roll;
-			break;
+    if (Mouse_X < 3+1 && Mouse_X > 0)
+        fMouse_X *= 3;
 
-		case FTN_X:
-			fMouse_Y = headpose->x * 3.0f;
-			break;
+    if (Mouse_Y > 0 && Mouse_Y < 6+1)
+        fMouse_Y = headpose[Mouse_Y-1];
 
-		case FTN_Y:
-			fMouse_Y = headpose->y * 3.0f;
-			break;
+    if (Mouse_Y < 3+1 && Mouse_Y > 0)
+        fMouse_Y *= 3;
 
-		case FTN_Z:
-			fMouse_Y = headpose->z * 3.0f;
-			break;
+    if (Mouse_Wheel > 0 && Mouse_Wheel < 6+1)
+        fMouse_Wheel = headpose[Mouse_Wheel-1];
 
-		default:
-			break;
-	}
-
-	//
-	// Determine which of the 6DOF's is used.
-	// The rotations are from -180 to +180 and the translations from -50cm to +50cm.
-	// Let's scale the translations to the degrees for simplicity sake...
-	//
-	switch (Mouse_Wheel) {
-		case FTN_PITCH:
-			fMouse_Wheel = headpose->pitch;
-			break;
-
-		case FTN_YAW:
-			fMouse_Wheel = headpose->yaw;
-			break;
-
-		case FTN_ROLL:
-			fMouse_Wheel = headpose->roll;
-			break;
-
-		case FTN_X:
-			fMouse_Wheel = headpose->x * 3.0f;
-			break;
-
-		case FTN_Y:
-			fMouse_Wheel = headpose->y * 3.0f;
-			break;
-
-		case FTN_Z:
-			fMouse_Wheel = headpose->z * 3.0f;
-			break;
-
-		default:
-			break;
-	}
+    if (Mouse_Wheel < 3+1 && Mouse_Wheel > 0)
+        fMouse_Wheel *= 3;
 
 	//
 	// Only send Input, when it has changed.
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index e4bc6256..e1305a6f 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -46,12 +46,12 @@
 #define MOUSE_AXIS_MAX 65535
 
 enum FTN_AngleName {
-	FTN_PITCH = 1,
-	FTN_YAW = 2,
-	FTN_ROLL = 3,
-	FTN_X = 4,
-	FTN_Y = 5,
-	FTN_Z = 6
+    FTN_PITCH = RX,
+    FTN_YAW = TY,
+    FTN_ROLL = RZ,
+    FTN_X = TX,
+    FTN_Y = TY,
+    FTN_Z = TZ
 };
 
 enum FTN_MouseStyle {
@@ -70,7 +70,7 @@ public:
     void Initialize();
 
     bool checkServerInstallationOK();
-	void sendHeadposeToGame( THeadPoseData *headpose, THeadPoseData *rawheadpose );
+    void sendHeadposeToGame( double *headpose, double *rawheadpose );
 	void getNameFromGame( char *dest );					// Take care dest can handle up to 100 chars...
 
 private:
-- 
cgit v1.2.3