4 files changed, 21 insertions, 11 deletions

diff --git a/src/libs/ray/ray_camera.c b/src/libs/ray/ray_camera.c
index b942cf3..a0e3d02 100644
--- a/src/libs/ray/ray_camera.c
+++ b/src/libs/ray/ray_camera.c
@@ -24,8 +24,8 @@ static ray_3f_t project_corner(ray_3f_t *forward, ray_3f_t *left, ray_3f_t *up,
 static void project_corners(const ray_camera_t *camera, ray_camera_frame_t *frame)
 {
 	ray_3f_t	forward, left, up, right, down;
-	float		half_horiz = (float)camera->width * 0.5f;
-	float		half_vert = (float)camera->height * 0.5f;
+	float		half_horiz = camera->film_width * 0.5f;
+	float		half_vert = camera->film_height * 0.5f;
 
 	ray_euler_basis(&camera->orientation, &forward, &up, &left);
 	right = ray_3f_negate(&left);
@@ -39,14 +39,14 @@ static void project_corners(const ray_camera_t *camera, ray_camera_frame_t *fram
 
 
 /* Prepare a frame of camera projection, initializing res_frame. */
-void ray_camera_frame_prepare(const ray_camera_t *camera, ray_camera_frame_t *res_frame)
+void ray_camera_frame_prepare(const ray_camera_t *camera, unsigned frame_width, unsigned frame_height, ray_camera_frame_t *res_frame)
 {
 	res_frame->camera = camera;
 
 	project_corners(camera, res_frame);
 
-	res_frame->x_delta = 1.0f / (float)camera->width;
-	res_frame->y_delta = 1.0f / (float)camera->height;
+	res_frame->x_delta = 1.0f / (float)frame_width;
+	res_frame->y_delta = 1.0f / (float)frame_height;
 }
 
 
diff --git a/src/libs/ray/ray_camera.h b/src/libs/ray/ray_camera.h
index e393beb..0a8af2a 100644
--- a/src/libs/ray/ray_camera.h
+++ b/src/libs/ray/ray_camera.h
@@ -13,9 +13,19 @@
 typedef struct ray_camera_t {
 	ray_3f_t	position;		/* position of camera, the origin of all its rays */
 	ray_euler_t	orientation;		/* orientation of the camera */
+
+	/* Units for focal_length, width, and height, are undefined in absolute terms or any
+	 * kind of SI unit - they're the same units of the virtual scene shared
+	 * with the objects.
+	 */
 	float		focal_length;		/* controls the field of view */
-	unsigned	width;			/* width of camera viewport in pixels */
-	unsigned	height;			/* height of camera viewport in pixels */
+
+	/* XXX: Note these are not the same as the rendered frame width and height in pixels,
+	 * these influence the frustum size and shape in the 3D world by controlling the 2D
+	 * plane size and shape that frustum intersects.
+	 */
+	float		film_width;		/* width of camera's virtual "film" */
+	float		film_height;		/* height of camera's virtual "film" */
 } ray_camera_t;
 
 
@@ -38,7 +48,7 @@ typedef struct ray_camera_fragment_t {
 } ray_camera_fragment_t;
 
 
-void ray_camera_frame_prepare(const ray_camera_t *camera, ray_camera_frame_t *res_frame);
+void ray_camera_frame_prepare(const ray_camera_t *camera, unsigned frame_width, unsigned frame_height, ray_camera_frame_t *res_frame);
 void ray_camera_fragment_begin(ray_camera_frame_t *frame, fb_fragment_t *fb_fragment, ray_ray_t *res_ray, ray_camera_fragment_t *res_fragment);
 
 
diff --git a/src/libs/ray/ray_render.c b/src/libs/ray/ray_render.c
index 1c7c79c..dbbfb47 100644
--- a/src/libs/ray/ray_render.c
+++ b/src/libs/ray/ray_render.c
@@ -221,7 +221,7 @@ void ray_render_trace_fragment(ray_render_t *render, fb_fragment_t *fb_fragment)
 /* prepare the scene for rendering with camera, must be called whenever anything in the scene+camera pair has been changed. */
 /* this is basically a time for the raytracer to precompute whatever it can which otherwise ends up occurring per-ray */
 /* the camera is included so primary rays which all have a common origin may be optimized for */
-ray_render_t * ray_render_new(const ray_scene_t *scene, const ray_camera_t *camera)
+ray_render_t * ray_render_new(const ray_scene_t *scene, const ray_camera_t *camera, unsigned frame_width, unsigned frame_height)
 {
 	ray_render_t	*render;
 	ray_object_t	*object;
@@ -239,7 +239,7 @@ ray_render_t * ray_render_new(const ray_scene_t *scene, const ray_camera_t *came
 
 	render->ambient_light = ray_3f_mult_scalar(&scene->ambient_color, scene->ambient_brightness);
 	ray_gamma_prepare(scene->gamma, &render->gamma);
-	ray_camera_frame_prepare(camera, &render->frame);
+	ray_camera_frame_prepare(camera, frame_width, frame_height, &render->frame);
 
 	for (i = 0, object = scene->objects; object->type; object++)
 		render->objects[i++] = ray_render_object_prepare(object, camera);
diff --git a/src/libs/ray/ray_render.h b/src/libs/ray/ray_render.h
index dfd769f..69daf86 100644
--- a/src/libs/ray/ray_render.h
+++ b/src/libs/ray/ray_render.h
@@ -8,7 +8,7 @@
 
 typedef struct ray_render_t ray_render_t;
 
-ray_render_t * ray_render_new(const ray_scene_t *scene, const ray_camera_t *camera);
+ray_render_t * ray_render_new(const ray_scene_t *scene, const ray_camera_t *camera, unsigned frame_width, unsigned frame_height);
 void ray_render_free(ray_render_t *render);
 void ray_render_trace_fragment(ray_render_t *render, fb_fragment_t *fb_fragment);