aboutsummaryrefslogtreecommitdiff
path: root/include/survive.h
diff options
context:
space:
mode:
authorJoshua Allen <axlecrusher@gmail.com>2017-02-25 14:22:13 -0500
committerJoshua Allen <axlecrusher@gmail.com>2017-02-25 14:22:13 -0500
commit021eb3fd655629b3d11b9923098689bf96c26890 (patch)
tree679c0b92846518e29fe3376f0dd3840bd1db5d03 /include/survive.h
parent4c4969d0cb0f817de2aa866a7d8abfde6ecaff82 (diff)
parentf92f5dc93cbb53a99da51984541a7e4a70605639 (diff)
downloadlibsurvive-021eb3fd655629b3d11b9923098689bf96c26890.tar.gz
libsurvive-021eb3fd655629b3d11b9923098689bf96c26890.tar.bz2
Merge github.com:cnlohr/libsurvive
Conflicts: Makefile
Diffstat (limited to 'include/survive.h')
-rw-r--r--include/survive.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/survive.h b/include/survive.h
index 3e8dc35..1b9c29c 100644
--- a/include/survive.h
+++ b/include/survive.h
@@ -4,7 +4,11 @@
#include <stdint.h>
#ifndef FLT
+#ifdef USE_DOUBLE
#define FLT double
+#else
+#define FLT float
+#endif
#endif
struct SurviveContext;
@@ -33,6 +37,7 @@ struct SurviveObject
FLT * sensor_locations;
FLT * sensor_normals;
+ int8_t nr_locations;
//Timing sensitive data (mostly for disambiguation)
int32_t timebase_hz; //48,000,000 for normal vive hardware. (checked)
@@ -43,7 +48,6 @@ struct SurviveObject
int32_t pulse_max_for_sweep; //1,800 for normal vive hardware. (guessed)
int32_t pulse_synctime_offset; //20,000 for normal vive hardware. (guessed)
int32_t pulse_synctime_slack; //5,000 for normal vive hardware. (guessed)
- int8_t nr_locations;
//Flood info, for calculating which laser is currently sweeping.
int8_t oldcode;