diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
| commit | c7d9d271796b20f886e2441de852498ecb25ca82 (patch) | |
| tree | 5929c2793c33c80e5392982a9baaa8d5ccaca724 /src/poser_sba.c | |
| parent | fe025b0ff6bfb440da7cec8f388fa951910a86f0 (diff) | |
| parent | 6a45298c9bc34aac59cc2ebb9de2d82c7a42756e (diff) | |
| download | libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.gz libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.bz2 | |
Merge branch 'master' into imu
Diffstat (limited to 'src/poser_sba.c')
| -rw-r--r-- | src/poser_sba.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/poser_sba.c b/src/poser_sba.c index f6b1131..f0d5645 100644 --- a/src/poser_sba.c +++ b/src/poser_sba.c @@ -133,7 +133,7 @@ typedef struct { SurvivePose poses; } sba_set_position_t; -static void sba_set_position(SurviveObject *so, uint8_t lighthouse, SurvivePose *new_pose, void *_user) { +static void sba_set_position(SurviveObject *so, uint32_t timecode, SurvivePose *new_pose, void *_user) { sba_set_position_t *user = _user; assert(user->hasInfo == false); user->hasInfo = 1; @@ -224,7 +224,7 @@ static double run_sba_find_3d_structure(SBAData *d, PoserDataLight *pdl, Survive PoserData hdr = pdl->hdr; memset(&pdl->hdr, 0, sizeof(pdl->hdr)); // Clear callback functions pdl->hdr.pt = hdr.pt; - pdl->hdr.rawposeproc = sba_set_position; + pdl->hdr.poseproc = sba_set_position; sba_set_position_t locations = {0}; pdl->hdr.userdata = &locations; @@ -282,7 +282,7 @@ static double run_sba_find_3d_structure(SBAData *d, PoserDataLight *pdl, Survive if (status > 0 && (info[1] / meas_size * 2) < d->max_error) { d->failures_to_reset_cntr = d->failures_to_reset; quatnormalize(soLocation.Rot, soLocation.Rot); - PoserData_poser_raw_pose_func(&pdl->hdr, so, 1, &soLocation); + PoserData_poser_pose_func(&pdl->hdr, so, &soLocation); } { @@ -456,8 +456,8 @@ int PoserSBA(SurviveObject *so, PoserData *pd) { PoserDataIMU * imu = (PoserDataIMU*)pd; if (ctx->calptr && ctx->calptr->stage < 5) { } else if(d->useIMU){ - survive_imu_tracker_integrate(so, &d->tracker, imu); - PoserData_poser_raw_pose_func(pd, so, 1, &d->tracker.pose); + survive_imu_tracker_integrate(so, &d->tracker, imu); + PoserData_poser_pose_func(pd, so, &d->tracker.pose); } } // INTENTIONAL FALLTHROUGH default: { |