diff options
| author | Justin Berger <jdavidberger@gmail.com> | 2018-06-27 04:22:22 +0000 |
|---|---|---|
| committer | Justin Berger <jdavidberger@gmail.com> | 2018-06-27 04:22:22 +0000 |
| commit | cf36bd58b8c9d1c23ccfe1a52beafe376ba02e6b (patch) | |
| tree | bae72f9ebe6937dbbabb7beec3115028a15743b0 /src/poser_general_optimizer.c | |
| parent | 902bbde43fb6e000140da0da56c05f2d4af1df5f (diff) | |
| parent | e68b69a9a14aeb70988c52666e60502fe6f049ab (diff) | |
| download | libsurvive-cf36bd58b8c9d1c23ccfe1a52beafe376ba02e6b.tar.gz libsurvive-cf36bd58b8c9d1c23ccfe1a52beafe376ba02e6b.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fix_wired_tracker
Diffstat (limited to 'src/poser_general_optimizer.c')
| -rw-r--r-- | src/poser_general_optimizer.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/poser_general_optimizer.c b/src/poser_general_optimizer.c index 057ac3d..6f181a3 100644 --- a/src/poser_general_optimizer.c +++ b/src/poser_general_optimizer.c @@ -5,6 +5,11 @@ #include <malloc.h> #include <stdio.h> +STATIC_CONFIG_ITEM( CONFIG_MAX_ERROR, "max-error", 'f', "Maximum error permitted by poser_general_optimizer", .0001 ); +STATIC_CONFIG_ITEM( CONFIG_FAIL_TO_RESET, "failures-to-reset", 'i', "Failures needed before seed poser is re-run", 1 ); +STATIC_CONFIG_ITEM( CONFIG_SUC_TO_RESET, "successes-to-reset", 'i', "[TODO: I don't know what this does]", -1 ); +STATIC_CONFIG_ITEM( CONFIG_SEED_POSER, "seed-poser", 's', "Poser to be used to seed optimizer", "PoserEPNP" ); + void *GetDriver(const char *name); void general_optimizer_data_init(GeneralOptimizerData *d, SurviveObject *so) { memset(d, 0, sizeof(*d)); @@ -12,11 +17,11 @@ void general_optimizer_data_init(GeneralOptimizerData *d, SurviveObject *so) { SurviveContext *ctx = so->ctx; - d->failures_to_reset = survive_configi(ctx, "failures-to-reset", SC_GET, 1); - d->successes_to_reset = survive_configi(ctx, "successes-to-reset", SC_GET, -1); - d->max_error = survive_configf(ctx, "max-error", SC_GET, .0001); + survive_attach_configf( ctx, "max-error", &d->max_error ); + survive_attach_configi( ctx, "failures-to-reset", &d->failures_to_reset ); + survive_attach_configi( ctx, "successes-to-reset", &d->successes_to_reset ); - const char *subposer = survive_configs(ctx, "seed-poser", SC_GET, "PoserEPNP"); + const char *subposer = survive_configs(ctx, "seed-poser", SC_GET, 0 ); d->seed_poser = (PoserCB)GetDriver(subposer); SV_INFO("Initializing general optimizer:"); |