cdo/batomorph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add camera aperture / depth-of-field

Browse Source
This commit is contained in:
Camden Dixie O'Brien
2025-09-23 15:36:08 +01:00
parent 9e3bc4176b
commit cc7ff471f1
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/camera.c
View File

@@ -10,11 +10,8 @@ static const vec3_t up = { 0.0, 1.0, 0.0 };
camera_t camera_init(
vec3_t pos, vec3_t target, double fov, uint32_t img_width,
uint32_t img_height)
uint32_t img_height, double aperture, double focal_len)
{
const vec3_t target_disp = vec3_sub(target, pos);
const double focal_len = vec3_len(target_disp);
const double fov_rad = M_PI * fov / 180.0;
const double aspect = (double)img_width / (double)img_height;
const double viewport_height = focal_len * tan(fov_rad / 2);
@@ -27,7 +24,9 @@ camera_t camera_init(
const vec3_t u = vec3_scale(u_hat, viewport_width);
const vec3_t v = vec3_scale(v_hat, -viewport_height);
const vec3_t topleft = vec3_sub(target, vec3_scale(vec3_add(u, v), 0.5));
const vec3_t topleft = vec3_sub(
vec3_add(pos, vec3_scale(w_hat, focal_len)),
vec3_scale(vec3_add(u, v), 0.5));
const vec3_t x_step = vec3_scale(u, 1.0 / (double)img_width);
const vec3_t y_step = vec3_scale(v, 1.0 / (double)img_height);
@@ -39,7 +38,10 @@ camera_t camera_init(
.pix_origin = pix_origin,
.x_step = x_step,
.y_step = y_step,
.u_hat = u_hat,
.v_hat = v_hat,
.img_width = img_width,
.img_height = img_height,
.aperture = aperture,
};
}

14
src/render.c
View File

@@ -94,9 +94,19 @@ static int render_thread(void *arg)
vec3_scale(camera->y_step, jitter.y));
const vec3_t jittered_pix = vec3_add(pix, offset);
vec3_t source = camera->pos;
if (camera->aperture != 0.0) {
const vec3_t pos
= vec3_scale(rng_xy(&slice->rng), camera->aperture);
const vec3_t offset = vec3_add(
vec3_scale(camera->u_hat, pos.x),
vec3_scale(camera->v_hat, pos.y));
source = vec3_add(source, offset);
}
const ray_t ray = {
.orig = camera->pos,
.dir = vec3_unit(vec3_sub(jittered_pix, camera->pos)),
.orig = source,
.dir = vec3_unit(vec3_sub(jittered_pix, source)),
};
const vec3_t sample = trace(ray, slice->scene, &slice->rng);