diff options
| author | Joshua Allen <axlecrusher@gmail.com> | 2017-03-08 20:10:22 -0500 |
|---|---|---|
| committer | Joshua Allen <axlecrusher@gmail.com> | 2017-03-08 20:10:22 -0500 |
| commit | 4384e9850016e2117fda6e50499afec797993002 (patch) | |
| tree | 6eae1ca4c09e839c8acbabe3f4be7f5ef204c295 /src/survive_cal_lhfind.c | |
| parent | b13b5f9af2c2803f919d8897cd3ed5d24831cad3 (diff) | |
| parent | 5eeecb19eb884baf4781280a9c8e1c394fe9c669 (diff) | |
| download | libsurvive-4384e9850016e2117fda6e50499afec797993002.tar.gz libsurvive-4384e9850016e2117fda6e50499afec797993002.tar.bz2 | |
Merge branch 'master' of github.com:cnlohr/libsurvive
Diffstat (limited to 'src/survive_cal_lhfind.c')
| -rw-r--r-- | src/survive_cal_lhfind.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/survive_cal_lhfind.c b/src/survive_cal_lhfind.c index 93d9dc0..a1bb2cc 100644 --- a/src/survive_cal_lhfind.c +++ b/src/survive_cal_lhfind.c @@ -7,13 +7,13 @@ #define MIN_HITS_FOR_VALID 10 -FLT static RunOpti( struct SurviveCalData * cd, int lh, int print, FLT * LighthousePos, FLT * LighthouseQuat ); +FLT static RunOpti( SurviveCalData * cd, int lh, int print, FLT * LighthousePos, FLT * LighthouseQuat ); //Values used for RunTest() -int survive_cal_lhfind( struct SurviveCalData * cd ) +int survive_cal_lhfind( SurviveCalData * cd ) { - struct SurviveContext * ctx = cd->ctx; + SurviveContext * ctx = cd->ctx; int cycle, i; int lh = 0; FLT dx, dy, dz; @@ -137,8 +137,8 @@ int survive_cal_lhfind( struct SurviveCalData * cd ) } cd->ctx->bsd[lh].PositionSet = 1; - copy3d( cd->ctx->bsd[lh].Position, LighthousePos ); - quatcopy( cd->ctx->bsd[lh].Quaternion, LighthouseQuat ); + copy3d( cd->ctx->bsd[lh].Pose.Pos, LighthousePos ); + quatcopy( cd->ctx->bsd[lh].Pose.Rot, LighthouseQuat ); } return 0; //Return 0 if success. @@ -149,14 +149,14 @@ int survive_cal_lhfind( struct SurviveCalData * cd ) -static FLT RunOpti( struct SurviveCalData * cd, int lh, int print, FLT * LighthousePos, FLT * LighthouseQuat ) +static FLT RunOpti( SurviveCalData * cd, int lh, int print, FLT * LighthousePos, FLT * LighthouseQuat ) { int i, p; FLT UsToTarget[3]; FLT LastUsToTarget[3]; FLT mux = .9; quatsetnone( LighthouseQuat ); - struct SurviveObject * hmd = cd->hmd; + SurviveObject * hmd = cd->hmd; FLT * hmd_points = hmd->sensor_locations; FLT * hmd_normals = hmd->sensor_normals; |