diff options
author | mwturvey <michael.w.turvey@intel.com> | 2017-03-23 09:56:33 -0700 |
---|---|---|
committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-23 09:56:33 -0700 |
commit | 78b7b6fb520c287caecbe895501898ef5c1440a5 (patch) | |
tree | a72988c97dfc7e724661d0dbed1699f76e9f6498 /include | |
parent | 280a6599fea76a7d2c16cfe0fcc5c8f37fde66de (diff) | |
parent | 39ef5af74702c8825a82f65cf68e6af875a814ee (diff) | |
download | libsurvive-78b7b6fb520c287caecbe895501898ef5c1440a5.tar.gz libsurvive-78b7b6fb520c287caecbe895501898ef5c1440a5.tar.bz2 |
Merge branch 'master' into alternate_disambiguator
# Conflicts:
# src/survive_data.c
# src/survive_vive.c
Diffstat (limited to 'include')
-rw-r--r-- | include/libsurvive/poser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libsurvive/poser.h b/include/libsurvive/poser.h index 98c926e..cf11e0c 100644 --- a/include/libsurvive/poser.h +++ b/include/libsurvive/poser.h @@ -45,6 +45,7 @@ typedef struct //If "lengths[...]" < 0, means not a valid piece of sweep information. FLT lengths[SENSORS_PER_OBJECT][NUM_LIGHTHOUSES][2]; FLT angles [SENSORS_PER_OBJECT][NUM_LIGHTHOUSES][2]; //2 Axes (Angles in LH space) + FLT synctimes[SENSORS_PER_OBJECT][NUM_LIGHTHOUSES]; PoserDataIMU lastimu; } PoserDataFullScene; |