summaryrefslogtreecommitdiff
path: root/src/modules/ray/ray_object_sphere.h
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2017-06-02 11:00:36 -0700
committerVito Caputo <vcaputo@pengaru.com>2017-06-02 11:11:16 -0700
commitcbc6c0eaf45a7ede48465d1f6d6f7e24c14bd9ce (patch)
tree4eeab222cec158eac34cc47505177d9bcf9443af /src/modules/ray/ray_object_sphere.h
parent84a473d0369c8d676a5a42dcbd11039360668e40 (diff)
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.
Diffstat (limited to 'src/modules/ray/ray_object_sphere.h')
-rw-r--r--src/modules/ray/ray_object_sphere.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/ray/ray_object_sphere.h b/src/modules/ray/ray_object_sphere.h
index aadda18..9c74752 100644
--- a/src/modules/ray/ray_object_sphere.h
+++ b/src/modules/ray/ray_object_sphere.h
@@ -4,6 +4,7 @@
#include <math.h>
#include "ray_3f.h"
+#include "ray_camera.h"
#include "ray_color.h"
#include "ray_object_type.h"
#include "ray_ray.h"
@@ -22,7 +23,7 @@ typedef struct ray_object_sphere_t {
} ray_object_sphere_t;
-static void ray_object_sphere_prepare(ray_object_sphere_t *sphere)
+static void ray_object_sphere_prepare(ray_object_sphere_t *sphere, ray_camera_t *camera)
{
sphere->_prepared.r2 = sphere->radius * sphere->radius;
@@ -31,7 +32,7 @@ static void ray_object_sphere_prepare(ray_object_sphere_t *sphere)
}
-static inline int ray_object_sphere_intersects_ray(ray_object_sphere_t *sphere, ray_ray_t *ray, float *res_distance)
+static inline int ray_object_sphere_intersects_ray(ray_object_sphere_t *sphere, unsigned depth, ray_ray_t *ray, float *res_distance)
{
ray_3f_t v = ray_3f_sub(&ray->origin, &sphere->center);
float b = ray_3f_dot(&v, &ray->direction);
© All Rights Reserved