summaryrefslogtreecommitdiffhomepage
path: root/FaceTrackNoIR/tracker.h
diff options
context:
space:
mode:
authorWim Vriend <facetracknoir@gmail.com>2010-06-11 18:09:28 +0000
committerWim Vriend <facetracknoir@gmail.com>2010-06-11 18:09:28 +0000
commita0feb94b670a150e4574f1921cfcfe59049be822 (patch)
tree26491b9b08295d80974a8303ca90370eb4151e63 /FaceTrackNoIR/tracker.h
parent602e4770360fb125ebdb129a6b777fe08a433370 (diff)
PPJoy 1st success
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@10 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
Diffstat (limited to 'FaceTrackNoIR/tracker.h')
-rw-r--r--FaceTrackNoIR/tracker.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/FaceTrackNoIR/tracker.h b/FaceTrackNoIR/tracker.h
index 23768f95..732d2a8d 100644
--- a/FaceTrackNoIR/tracker.h
+++ b/FaceTrackNoIR/tracker.h
@@ -37,6 +37,7 @@
#include "FTServer.h" // Freetrack-server
#include "FGServer.h" // FlightGear-server
+#include "PPJoyServer.h" // Virtual Joystick
// include the DirectX Library files
#pragma comment (lib, "dinput8.lib")
@@ -117,6 +118,7 @@ private:
FTServer *server_FT; // Freetrack Server
FGServer *server_FG; // FlightGear Server
+ PPJoyServer *server_PPJoy; // PPJoy Server
protected:
// qthread override run method
@@ -178,7 +180,7 @@ public:
static void setNeutralZone(int x) { rotNeutralZone = (x * 2.0f * 3.14159)/360.0f; }
float getSmoothFromList ( QList<float> *rawList );
- float getDegreesFromRads ( float rads ) { return ((rads * 360.0f)/ (2.0f * 3.14159)); }
+ float getDegreesFromRads ( float rads ) { return (rads * 57.295781f); }
// For now, use one slider for all
void setSmoothing(int x) {