diff options
author | Vito Caputo <vcaputo@gnugeneration.com> | 2023-08-30 13:45:07 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2023-08-30 13:49:54 -0700 |
commit | 20d097ab1fe8ef5b62f4169f4353cc0074c27e4b (patch) | |
tree | 412f1069b7a3fa3953df02b54302bbdca3ddf6fb /src/modules/sparkler/simple.c | |
parent | a634b2df74222be85a03b1895ee10135822031c3 (diff) |
sparkler: parameterize particles
Having everything in fixed defines severely constrains the
diversity of particle behaviors and appearances.
This commit has been sitting around bitrotting since 2017, but
now that there's all this settings infra. and randomizing via
rtv, it seems worth landing, so I've rebased and am merging to
prevent a bitrot->rebase recurrence.
As-is, this commit ~minimally establishes a somewhat streamlined
parameterizing mechanism w/X-Macro patterns, while wiring up a
few of the obvious use cases surrounding xplode/burst, colorizing
the default sparkler explosions while at it.
It appears that when I first hacked this up I did some
experimentation with parameters as well, so there are some tweaks
to the behavior as opposed to a strict conversion of the fixed
defines to parameters. They seem minor enough to just leave be.
Plus a few minor optimizations like converting divides to
multiplies were in there.
Future commits can now wire up settings to choose from parameter
presets for different sparklers...
Diffstat (limited to 'src/modules/sparkler/simple.c')
-rw-r--r-- | src/modules/sparkler/simple.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/modules/sparkler/simple.c b/src/modules/sparkler/simple.c index 3bc3076..74b3d58 100644 --- a/src/modules/sparkler/simple.c +++ b/src/modules/sparkler/simple.c @@ -1,3 +1,4 @@ +#include <stdarg.h> #include <stdlib.h> #include "til_fb.h" @@ -24,7 +25,7 @@ typedef struct _simple_ctxt_t { } simple_ctxt_t; -static int simple_init(particles_t *particles, const particles_conf_t *conf, particle_t *p) +static int simple_init(particles_t *particles, const particles_conf_t *conf, particle_t *p, unsigned n_params, va_list params) { simple_ctxt_t *ctxt = p->ctxt; @@ -78,17 +79,17 @@ static particle_status_t simple_sim(particles_t *particles, const particles_conf if (i == (SIMPLE_MAX_SPAWN - 2)) { ops = &rocket_ops; - props.velocity = (float)rand_within_range(conf->seedp, 60, 100) / 1000000.0; + props.velocity = (float)rand_within_range(conf->seedp, 60, 100) * .000001; } else { - props.velocity = (float)rand_within_range(conf->seedp, 30, 100) / 10000.0; + props.velocity = (float)rand_within_range(conf->seedp, 30, 400) * .00001; } - props.direction.x += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) / 100.0; - props.direction.y += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) / 100.0; - props.direction.z += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) / 100.0; + props.direction.x += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) * .01; + props.direction.y += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) * .01; + props.direction.z += (float)(rand_within_range(conf->seedp, 0, 315 * 2) - 315) * .01; props.direction = v3f_normalize(&props.direction); - particles_spawn_particle(particles, p, &props, ops); // XXX + particles_spawn_particle(particles, p, &props, ops, 0); // XXX } } |