summaryrefslogtreecommitdiff
path: root/src/modules/flui2d
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-03-12 17:29:26 -0800
committerVito Caputo <vcaputo@pengaru.com>2022-03-12 23:22:51 -0800
commit7ff8ef94c05ae6386463b63f3ba25add52340d8b (patch)
tree585b67df6590acac86d287e42a6bffb0bf995639 /src/modules/flui2d
parent009f16f93b2a055ec0e14751e6d779849f87ab04 (diff)
til_settings: always describe relevant settings
The existing iterative *_setup() interface only described settings not found, quietly accepting usable settings already present in the til_settings_t. This worked fine for the existing interactive text setup thing, but it's especially problematic for providing a GUI setup frontend. This commit makes it so the *_setup() methods always describe undescribed settings they recognize, leaving the setup frontend loop calling into the *_setup() methods to both apply the description validation if wanted and actually tie the description to respective setting returned by the _setup() methods as being related to the returned description. A new helper called til_settings_get_and_describe_value() has been introduced primarily for use of module setup methods to simplify this nonsense, replacing the til_settings_get_value() calls and surrounding logic, but retaining the til_setting_desc_t definitions largely verbatim. This also results in discarding of some ad-hoc til_setting_desc_check() calls, now that there's a centralized place where settings become "described" (setup_interactively in the case of rototiller). Now a GUI frontend (like glimmer) would just provide its own setup_interactively() equivalent for constructing its widgets for a given *_setup() method's chain of returned descs. Whereas in the past this wasn't really feasible unless there was never going to be pre-supplied settings. I suspect the til_setting_desc_check() integration into setup_interactively() needs more work, but I think this is good enough for now and I'm out of spare time for the moment.
Diffstat (limited to 'src/modules/flui2d')
-rw-r--r--src/modules/flui2d/flui2d.c103
1 files changed, 47 insertions, 56 deletions
diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c
index 5fb6087..ff0b6a4 100644
--- a/src/modules/flui2d/flui2d.c
+++ b/src/modules/flui2d/flui2d.c
@@ -283,7 +283,7 @@ static void flui2d_render_fragment(void *context, unsigned ticks, unsigned cpu,
/* Settings hooks for configurable variables */
-static int flui2d_setup(const til_settings_t *settings, til_setting_desc_t **next_setting)
+static int flui2d_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc)
{
const char *viscosity;
const char *diffusion;
@@ -307,61 +307,52 @@ static int flui2d_setup(const til_settings_t *settings, til_setting_desc_t **nex
".01",
NULL
};
-
-
- viscosity = til_settings_get_value(settings, "viscosity");
- if (!viscosity) {
- int r;
-
- r = til_setting_desc_clone(&(til_setting_desc_t){
- .name = "Fluid Viscosity",
- .key = "viscosity",
- .regex = "\\.[0-9]+",
- .preferred = TIL_SETTINGS_STR(DEFAULT_VISCOSITY),
- .values = values,
- .annotations = NULL
- }, next_setting);
- if (r < 0)
- return r;
-
- return 1;
- }
-
- diffusion = til_settings_get_value(settings, "diffusion");
- if (!diffusion) {
- int r;
-
- r = til_setting_desc_clone(&(til_setting_desc_t){
- .name = "Fluid Diffusion",
- .key = "diffusion",
- .regex = "\\.[0-9]+",
- .preferred = TIL_SETTINGS_STR(DEFAULT_DIFFUSION),
- .values = values,
- .annotations = NULL
- }, next_setting);
- if (r < 0)
- return r;
-
- return 1;
- }
-
- decay = til_settings_get_value(settings, "decay");
- if (!decay) {
- int r;
-
- r = til_setting_desc_clone(&(til_setting_desc_t){
- .name = "Fluid Decay",
- .key = "decay",
- .regex = "\\.[0-9]+",
- .preferred = TIL_SETTINGS_STR(DEFAULT_DECAY),
- .values = decay_values,
- .annotations = NULL
- }, next_setting);
- if (r < 0)
- return r;
-
- return 1;
- }
+ int r;
+
+ r = til_settings_get_and_describe_value(settings,
+ &(til_setting_desc_t){
+ .name = "Fluid Viscosity",
+ .key = "viscosity",
+ .regex = "\\.[0-9]+",
+ .preferred = TIL_SETTINGS_STR(DEFAULT_VISCOSITY),
+ .values = values,
+ .annotations = NULL
+ },
+ &viscosity,
+ res_setting,
+ res_desc);
+ if (r)
+ return r;
+
+ r = til_settings_get_and_describe_value(settings,
+ &(til_setting_desc_t){
+ .name = "Fluid Diffusion",
+ .key = "diffusion",
+ .regex = "\\.[0-9]+",
+ .preferred = TIL_SETTINGS_STR(DEFAULT_DIFFUSION),
+ .values = values,
+ .annotations = NULL
+ },
+ &diffusion,
+ res_setting,
+ res_desc);
+ if (r)
+ return r;
+
+ r = til_settings_get_and_describe_value(settings,
+ &(til_setting_desc_t){
+ .name = "Fluid Decay",
+ .key = "decay",
+ .regex = "\\.[0-9]+",
+ .preferred = TIL_SETTINGS_STR(DEFAULT_DECAY),
+ .values = decay_values,
+ .annotations = NULL
+ },
+ &decay,
+ res_setting,
+ res_desc);
+ if (r)
+ return r;
/* TODO: return -EINVAL on parse errors? */
sscanf(viscosity, "%f", &flui2d_viscosity);
© All Rights Reserved