summaryrefslogtreecommitdiff
path: root/src/modules/sparkler/sparkler.c
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2020-09-11 00:48:13 -0700
committerVito Caputo <vcaputo@pengaru.com>2020-09-11 01:05:40 -0700
commit85127285bff6983665275fe14d3c2b80b36a872a (patch)
tree0215b33ee3b1101b9300d790f15914fa4e2bfcdf /src/modules/sparkler/sparkler.c
parenta9f489265c1ebbc67a3f675d1a79a2254345b489 (diff)
module/sparkler: implement some BSP drawing settings
This commit adds a few settings for visualizing the octree BSP: show_bsp_leafs (on/off): Draw wireframe cubes around octree leaf nodes show_bsp_leafs_min_depth (0,4,6,8,10): Set minimum octree depth for leaf nodes displayed show_bsp_matches (on/off): Draw lines connecting BSP search matches show_bsp_matches_affected_only (on/off): Limit drawn BSP search matches to only matches actually affected by the simulation The code implementing this stuff is a bit crufty, fb_fragment_t had to be pulled down to the sim ops for example and whether that actually results in drawing occurring during the sim phase depends on the config used and how the particle implementations react to the config... it's just gross. This matters because the caller used to know only the draw phase touched fb_fragment_t, and because of that the fragment was zeroed after sim and before draw in parallel. But now the caller needs to know if the config would make sim do some drawing, and do the fragment zeroing before sim instead, and skip the zero before draw to not lose what sim drew. It's icky, but I'll leave it for now, at least it's isolated to the sparkler.
Diffstat (limited to 'src/modules/sparkler/sparkler.c')
-rw-r--r--src/modules/sparkler/sparkler.c78
1 files changed, 69 insertions, 9 deletions
diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index 20a56c7..b673d0c 100644
--- a/src/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
@@ -74,7 +74,10 @@ static void sparkler_prepare_frame(void *context, unsigned ticks, unsigned ncpus
*res_fragmenter = sparkler_fragmenter;
ctxt->n_cpus = ncpus;
- particles_sim(ctxt->particles);
+ if (sparkler_conf.show_bsp_matches)
+ fb_fragment_zero(fragment);
+
+ particles_sim(ctxt->particles, fragment);
particles_add_particles(ctxt->particles, NULL, &simple_ops, INIT_PARTS / 4);
particles_age(ctxt->particles);
}
@@ -85,7 +88,9 @@ static void sparkler_render_fragment(void *context, unsigned ticks, unsigned cpu
{
sparkler_context_t *ctxt = context;
- fb_fragment_zero(fragment);
+ if (!sparkler_conf.show_bsp_matches)
+ fb_fragment_zero(fragment);
+
particles_draw(ctxt->particles, fragment);
}
@@ -96,11 +101,13 @@ static int sparkler_setup(const settings_t *settings, setting_desc_t **next_sett
const char *show_bsp_leafs;
const char *show_bsp_matches;
const char *values[] = {
- "on",
"off",
+ "on",
NULL
};
+ /* TODO: return -EINVAL on parse errors? */
+
show_bsp_leafs = settings_get_value(settings, "show_bsp_leafs");
if (!show_bsp_leafs) {
int r;
@@ -117,6 +124,40 @@ static int sparkler_setup(const settings_t *settings, setting_desc_t **next_sett
return 1;
}
+ if (!strcasecmp(show_bsp_leafs, "on")) {
+ const char *show_bsp_leafs_min_depth;
+
+ sparkler_conf.show_bsp_leafs = 1;
+
+ show_bsp_leafs_min_depth = settings_get_value(settings, "show_bsp_leafs_min_depth");
+ if (!show_bsp_leafs_min_depth) {
+ const char *depth_values[] = {
+ "0",
+ "4",
+ "6",
+ "8",
+ "10",
+ NULL
+ };
+ int r;
+
+ r = setting_desc_clone(&(setting_desc_t){
+ .name = "Show BSP Leaf Node Bounding Boxes Minimum Depth",
+ .key = "show_bsp_leafs_min_depth",
+ .preferred = "8",
+ .values = depth_values,
+ }, next_setting);
+ if (r < 0)
+ return r;
+
+ return 1;
+ }
+
+ sscanf(show_bsp_leafs_min_depth, "%u", &sparkler_conf.show_bsp_leafs_min_depth);
+ } else {
+ sparkler_conf.show_bsp_leafs = 0;
+ }
+
show_bsp_matches = settings_get_value(settings, "show_bsp_matches");
if (!show_bsp_matches) {
int r;
@@ -133,17 +174,36 @@ static int sparkler_setup(const settings_t *settings, setting_desc_t **next_sett
return 1;
}
- /* TODO: return -EINVAL on parse errors? */
- if (!strcasecmp(show_bsp_leafs, "on"))
- sparkler_conf.show_bsp_leafs = 1;
- else
- sparkler_conf.show_bsp_leafs = 0;
-
if (!strcasecmp(show_bsp_matches, "on"))
sparkler_conf.show_bsp_matches = 1;
else
sparkler_conf.show_bsp_matches = 0;
+ if (!strcasecmp(show_bsp_matches, "on")) {
+ const char *show_bsp_matches_affected_only;
+
+ show_bsp_matches_affected_only = settings_get_value(settings, "show_bsp_matches_affected_only");
+ if (!show_bsp_matches_affected_only) {
+ int r;
+
+ r = setting_desc_clone(&(setting_desc_t){
+ .name = "Show Only Affected BSP Search Matches",
+ .key = "show_bsp_matches_affected_only",
+ .preferred = "off",
+ .values = values,
+ }, next_setting);
+ if (r < 0)
+ return r;
+
+ return 1;
+ }
+
+ if (!strcasecmp(show_bsp_matches_affected_only, "on"))
+ sparkler_conf.show_bsp_matches_affected_only = 1;
+ else
+ sparkler_conf.show_bsp_matches_affected_only = 0;
+ }
+
return 0;
}
© All Rights Reserved