From 95eab1b8938e0033a0aa0d10d6ec53d7d2782907 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sun, 11 Mar 2018 15:31:28 -0600 Subject: Added callback for lighthouse found; example in test.c --- src/survive_cal.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/survive_cal.c') diff --git a/src/survive_cal.c b/src/survive_cal.c index 696cce4..59cf68b 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -651,9 +651,6 @@ static void handle_calibration( struct SurviveCalData *cd ) fprintf( fobjp, "%f %f %f %f\n", objfromlh->Rot[0], objfromlh->Rot[1], objfromlh->Rot[2], objfromlh->Rot[3] ); if (ctx->bsd[lh].PositionSet) { - config_set_lighthouse(ctx->lh_config, &ctx->bsd[0], 0); - config_set_lighthouse(ctx->lh_config, &ctx->bsd[1], 1); - if (compute_reprojection_error) { FLT reproj_err = 0; size_t cnt = 0; @@ -690,7 +687,6 @@ static void handle_calibration( struct SurviveCalData *cd ) } } - config_save(ctx, "config.json"); } fclose( fobjp ); -- cgit v1.2.3 From 12f864db460dc6318694ec9e6d65f7740ae85749 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sun, 11 Mar 2018 15:54:35 -0600 Subject: Preparing to add more to PoserData --- src/survive_cal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/survive_cal.c') 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++ ) { -- cgit v1.2.3 From ee0fd0be34cd6715b704be534b7e97087905571f Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sun, 11 Mar 2018 16:24:13 -0600 Subject: Redirected posers to used passed in callbacks --- src/survive_cal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/survive_cal.c') diff --git a/src/survive_cal.c b/src/survive_cal.c index 26ed1ad..fb3b240 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -603,7 +603,7 @@ static void handle_calibration( struct SurviveCalData *cd ) for( obj = 0; obj < cd->numPoseObjects; obj++ ) { int i, j; - PoserDataFullScene fsd; + PoserDataFullScene fsd = {}; fsd.hdr.pt = POSERDATA_FULL_SCENE; for( j = 0; j < NUM_LIGHTHOUSES; j++ ) for( i = 0; i < SENSORS_PER_OBJECT; i++ ) -- cgit v1.2.3