diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-03-11 15:54:35 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-12 09:52:50 -0600 |
| commit | 12f864db460dc6318694ec9e6d65f7740ae85749 (patch) | |
| tree | d4527deed94acdb6b702dda758ba9803aef8ab21 /src | |
| parent | 95eab1b8938e0033a0aa0d10d6ec53d7d2782907 (diff) | |
| download | libsurvive-12f864db460dc6318694ec9e6d65f7740ae85749.tar.gz libsurvive-12f864db460dc6318694ec9e6d65f7740ae85749.tar.bz2 | |
Preparing to add more to PoserData
Diffstat (limited to 'src')
| -rwxr-xr-x | src/survive_cal.c | 2 | ||||
| -rw-r--r-- | src/survive_process.c | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/survive_cal.c b/src/survive_cal.c index 59cf68b..26ed1ad 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -604,7 +604,7 @@ static void handle_calibration( struct SurviveCalData *cd ) { int i, j; PoserDataFullScene fsd; - fsd.pt = POSERDATA_FULL_SCENE; + fsd.hdr.pt = POSERDATA_FULL_SCENE; for( j = 0; j < NUM_LIGHTHOUSES; j++ ) for( i = 0; i < SENSORS_PER_OBJECT; i++ ) { diff --git a/src/survive_process.c b/src/survive_process.c index 420e771..e45a979 100644 --- a/src/survive_process.c +++ b/src/survive_process.c @@ -52,7 +52,10 @@ void survive_default_angle_process( SurviveObject * so, int sensor_id, int acode if( so->PoserFn ) { PoserDataLight l = { - .pt = POSERDATA_LIGHT, + .hdr = + { + .pt = POSERDATA_LIGHT, + }, .sensor_id = sensor_id, .acode = acode, .timecode = timecode, @@ -126,11 +129,14 @@ void survive_default_imu_process( SurviveObject * so, int mask, FLT * accelgyrom if( so->PoserFn ) { PoserDataIMU imu = { - .pt = POSERDATA_IMU, + .hdr = + { + .pt = POSERDATA_IMU, + }, .datamask = mask, - .accel = { accelgyromag[0], accelgyromag[1], accelgyromag[2] }, - .gyro = { accelgyromag[3], accelgyromag[4], accelgyromag[5] }, - .mag = { accelgyromag[6], accelgyromag[7], accelgyromag[8] }, + .accel = {accelgyromag[0], accelgyromag[1], accelgyromag[2]}, + .gyro = {accelgyromag[3], accelgyromag[4], accelgyromag[5]}, + .mag = {accelgyromag[6], accelgyromag[7], accelgyromag[8]}, .timecode = timecode, }; so->PoserFn( so, (PoserData *)&imu ); |