diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-10-15 14:07:20 +1100 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-10-15 14:07:20 +1100 |
| commit | dbd04e283082ab869a22abf03c4c6280b03935bb (patch) | |
| tree | 3951c6f91f76047e655f35e04db4eecd576c49df /x-plane-plugin | |
| parent | d880464fbe9180aefde94594330126e115066dc3 (diff) | |
| parent | 051a2e4392bc75b246cc5cb897ae0bbb1f92042e (diff) | |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman
Conflicts:
ftnoir_filter_kalman/ftnoir_filter_kalman.h
Diffstat (limited to 'x-plane-plugin')
| -rw-r--r-- | x-plane-plugin/plugin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x-plane-plugin/plugin.c b/x-plane-plugin/plugin.c index 62c9d6f0..3958c895 100644 --- a/x-plane-plugin/plugin.c +++ b/x-plane-plugin/plugin.c @@ -13,8 +13,6 @@ #include <XPLMCamera.h> #include <XPLMProcessing.h> -#include "ftnoir_tracker_base/ftnoir_tracker_types.h" - #ifndef PLUGIN_API #define PLUGIN_API #endif @@ -23,6 +21,10 @@ #define WINE_SHM_NAME "facetracknoir-wine-shm" #define WINE_MTX_NAME "facetracknoir-wine-mtx" +enum Axis { + TX = 0, TY, TZ, Yaw, Pitch, Roll +}; + typedef struct PortableLockedShm { void* mem; int fd, size; |