From 0dccfcddead6d523f8d8cf6ea3eb7973bd1b6fec Mon Sep 17 00:00:00 2001 From: Camden Dixie O'Brien Date: Tue, 23 Sep 2025 15:36:08 +0100 Subject: [PATCH] Rename rng_disc() to rng_plusminus() --- demo.c | 6 +++--- include/rng.h | 2 +- src/rng.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/demo.c b/demo.c index 2ef973e..922b36a 100644 --- a/demo.c +++ b/demo.c @@ -50,8 +50,8 @@ static void rand_obj(obj_t *out, rng_t *rng) } const double r = MIN_RAD + (MAX_RAD - MIN_RAD) * rng_canon(rng); - const double x = MAX_DIST * rng_disc(rng); - const double z = MAX_DIST * rng_disc(rng); + const double x = MAX_DIST * rng_plusminus(rng); + const double z = MAX_DIST * rng_plusminus(rng); *out = (obj_t)SPHERE(x, r, z, r, material); } @@ -62,7 +62,7 @@ int main() rand_obj(objs + i, &rng); img_t img = { .pix = pixbuf }; - camera_t camera = camera_init(camera_pos, target, FOV, W, H); + camera_t camera = camera_init(camera_pos, target, FOV, W, H, APERTURE); const scene_t scene = { .sky_colour = sky, diff --git a/include/rng.h b/include/rng.h index 2ff4800..d1252b8 100644 --- a/include/rng.h +++ b/include/rng.h @@ -12,7 +12,7 @@ typedef struct { rng_t rng_init(unsigned seed); uint32_t rng_uint32(rng_t *rng); double rng_canon(rng_t *rng); -double rng_disc(rng_t *rng); +double rng_plusminus(rng_t *rng); vec3_t rng_vec3(rng_t *rng); vec3_t rng_gaussian_xy(rng_t *rng, double stddev); diff --git a/src/rng.c b/src/rng.c index acc5e6a..3ba51d8 100644 --- a/src/rng.c +++ b/src/rng.c @@ -30,14 +30,15 @@ double rng_canon(rng_t *rng) return (double)rng_uint32(rng) / (double)UINT32_MAX; } -double rng_disc(rng_t *rng) +double rng_plusminus(rng_t *rng) { return 2.0 * rng_canon(rng) - 1.0; } vec3_t rng_vec3(rng_t *rng) { - const vec3_t v = { rng_disc(rng), rng_disc(rng), rng_disc(rng) }; + const vec3_t v + = { rng_plusminus(rng), rng_plusminus(rng), rng_plusminus(rng) }; return vec3_unit(v); }