From 627e3a65e5060fb27b8ee7188757af28715a617e Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Tue, 15 Feb 2022 12:46:35 -0800 Subject: modules/*: remove inappropriate 'f' numeric suffixes These are making it into the settings strings, it's benign only because regexps aren't currently being enforced. Fix it up anyways. --- src/modules/drizzle/drizzle.c | 10 +++++----- src/modules/flui2d/flui2d.c | 25 ++++++++++--------------- src/modules/stars/stars.c | 14 +++++++------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/modules/drizzle/drizzle.c b/src/modules/drizzle/drizzle.c index f0ed956..a637368 100644 --- a/src/modules/drizzle/drizzle.c +++ b/src/modules/drizzle/drizzle.c @@ -24,7 +24,7 @@ #define PUDDLE_SIZE 512 #define DRIZZLE_CNT 20 -#define DEFAULT_VISCOSITY .01f +#define DEFAULT_VISCOSITY .01 typedef struct drizzle_context_t { puddle_t *puddle; @@ -157,10 +157,10 @@ static int drizzle_setup(const til_settings_t *settings, til_setting_desc_t **ne { const char *viscosity; const char *values[] = { - ".005f", - ".01f", - ".03f", - ".05f", + ".005", + ".01", + ".03", + ".05", NULL }; diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c index 3b0e629..388bb7f 100644 --- a/src/modules/flui2d/flui2d.c +++ b/src/modules/flui2d/flui2d.c @@ -16,14 +16,9 @@ * - Vito Caputo 10/13/2019 */ -#if 1 /* These knobs affect how the simulated fluid behaves */ -#define DEFAULT_VISCOSITY .000000001f -#define DEFAULT_DIFFUSION .00001f -#else -#define DEFAULT_VISCOSITY .00001f -#define DEFAULT_DIFFUSION .000001f -#endif +#define DEFAULT_VISCOSITY .000000001 +#define DEFAULT_DIFFUSION .00001 #define ROOT 128 // Change this to vary the density field resolution #define SIZE ((ROOT + 2) * (ROOT + 2)) @@ -289,14 +284,14 @@ static int flui2d_setup(const til_settings_t *settings, til_setting_desc_t **nex const char *viscosity; const char *diffusion; const char *values[] = { - ".000000000001f", - ".0000000001f", - ".000000001f", - ".00000001f", - ".0000001f", - ".000001f", - ".00001f", - ".0001f", + ".000000000001", + ".0000000001", + ".000000001", + ".00000001", + ".0000001", + ".000001", + ".00001", + ".0001", NULL }; diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c index 56e7188..9a0d2a9 100644 --- a/src/modules/stars/stars.c +++ b/src/modules/stars/stars.c @@ -15,7 +15,7 @@ /* Copyright (C) 2017-20 Philip J. Freeman */ -#define DEFAULT_ROT_ADJ .00003f +#define DEFAULT_ROT_ADJ .00003 static float stars_rot_adj = DEFAULT_ROT_ADJ; @@ -205,12 +205,12 @@ int stars_setup(const til_settings_t *settings, til_setting_desc_t **next_settin { const char *rot_adj; const char *rot_adj_values[] = { - ".0f", - ".00001f", - ".00003f", - ".0001f", - ".0003f", - ".001f", + ".0", + ".00001", + ".00003", + ".0001", + ".0003", + ".001", NULL }; -- cgit v1.2.1