From cbc6c0eaf45a7ede48465d1f6d6f7e24c14bd9ce Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 2 Jun 2017 11:00:36 -0700 Subject: ray: plumb depth and camera to objects To enable prepare to precompute aspects of primary rays which all have a common origin at the camera, bring the camera to ray_object*_prepare() and bring the depth to ray_object*_intersects_ray() for primary ray detection. This is only scaffolding, functionally unchanged. --- src/modules/ray/ray_object_plane.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/modules/ray/ray_object_plane.h') diff --git a/src/modules/ray/ray_object_plane.h b/src/modules/ray/ray_object_plane.h index cc7ea8d..0be28f4 100644 --- a/src/modules/ray/ray_object_plane.h +++ b/src/modules/ray/ray_object_plane.h @@ -2,6 +2,7 @@ #define _RAY_OBJECT_PLANE_H #include "ray_3f.h" +#include "ray_camera.h" #include "ray_object_type.h" #include "ray_ray.h" #include "ray_surface.h" @@ -15,12 +16,12 @@ typedef struct ray_object_plane_t { } ray_object_plane_t; -static void ray_object_plane_prepare(ray_object_plane_t *plane) +static void ray_object_plane_prepare(ray_object_plane_t *plane, ray_camera_t *camera) { } -static inline int ray_object_plane_intersects_ray(ray_object_plane_t *plane, ray_ray_t *ray, float *res_distance) +static inline int ray_object_plane_intersects_ray(ray_object_plane_t *plane, unsigned depth, ray_ray_t *ray, float *res_distance) { float d = ray_3f_dot(&plane->normal, &ray->direction); -- cgit v1.2.3