diff options
| -rw-r--r-- | src/modules/ray/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/ray/ray_object.c | 98 | ||||
| -rw-r--r-- | src/modules/ray/ray_object.h | 95 |
3 files changed, 92 insertions, 103 deletions
diff --git a/src/modules/ray/Makefile.am b/src/modules/ray/Makefile.am index b0e9997..872efb6 100644 --- a/src/modules/ray/Makefile.am +++ b/src/modules/ray/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libray.a -libray_a_SOURCES = ray_3f.h ray.c ray_camera.c ray_camera.h ray_color.h ray_euler.c ray_euler.h ray_light_emitter.h ray_object.c ray_object.h ray_object_light.h ray_object_plane.h ray_object_point.h ray_object_sphere.h ray_object_type.h ray_ray.h ray_scene.c ray_scene.h ray_surface.h +libray_a_SOURCES = ray_3f.h ray.c ray_camera.c ray_camera.h ray_color.h ray_euler.c ray_euler.h ray_light_emitter.h ray_object.h ray_object_light.h ray_object_plane.h ray_object_point.h ray_object_sphere.h ray_object_type.h ray_ray.h ray_scene.c ray_scene.h ray_surface.h libray_a_CFLAGS = @ROTOTILLER_CFLAGS@ -ffast-math libray_a_CPPFLAGS = @ROTOTILLER_CFLAGS@ -I@top_srcdir@/src diff --git a/src/modules/ray/ray_object.c b/src/modules/ray/ray_object.c deleted file mode 100644 index ec3dcd8..0000000 --- a/src/modules/ray/ray_object.c +++ /dev/null @@ -1,98 +0,0 @@ -#include <assert.h> - -#include "ray_object.h" -#include "ray_object_light.h" -#include "ray_object_plane.h" -#include "ray_object_point.h" -#include "ray_object_sphere.h" -#include "ray_ray.h" -#include "ray_surface.h" - - -/* Prepare an object for rendering. - * If the object has any pre-calculating to do, this is where it happens. - * The pre-calculated stuff is object-resident under a _prepared struct member. - */ -void ray_object_prepare(ray_object_t *object) -{ - switch (object->type) { - case RAY_OBJECT_TYPE_SPHERE: - return ray_object_sphere_prepare(&object->sphere); - - case RAY_OBJECT_TYPE_POINT: - return ray_object_point_prepare(&object->point); - - case RAY_OBJECT_TYPE_PLANE: - return ray_object_plane_prepare(&object->plane); - - case RAY_OBJECT_TYPE_LIGHT: - return ray_object_light_prepare(&object->light); - default: - assert(0); - } -} - - -/* Determine if a ray intersects object. - * If the object is intersected, store where along the ray the intersection occurs in res_distance. - */ -int ray_object_intersects_ray(ray_object_t *object, ray_ray_t *ray, float *res_distance) -{ - switch (object->type) { - case RAY_OBJECT_TYPE_SPHERE: - return ray_object_sphere_intersects_ray(&object->sphere, ray, res_distance); - - case RAY_OBJECT_TYPE_POINT: - return ray_object_point_intersects_ray(&object->point, ray, res_distance); - - case RAY_OBJECT_TYPE_PLANE: - return ray_object_plane_intersects_ray(&object->plane, ray, res_distance); - - case RAY_OBJECT_TYPE_LIGHT: - return ray_object_light_intersects_ray(&object->light, ray, res_distance); - default: - assert(0); - } -} - - -/* Return the surface normal of object @ point */ -ray_3f_t ray_object_normal(ray_object_t *object, ray_3f_t *point) -{ - switch (object->type) { - case RAY_OBJECT_TYPE_SPHERE: - return ray_object_sphere_normal(&object->sphere, point); - - case RAY_OBJECT_TYPE_POINT: - return ray_object_point_normal(&object->point, point); - - case RAY_OBJECT_TYPE_PLANE: - return ray_object_plane_normal(&object->plane, point); - - case RAY_OBJECT_TYPE_LIGHT: - return ray_object_light_normal(&object->light, point); - default: - assert(0); - } -} - - -/* Return the surface of object @ point */ -ray_surface_t ray_object_surface(ray_object_t *object, ray_3f_t *point) -{ - switch (object->type) { - case RAY_OBJECT_TYPE_SPHERE: - return ray_object_sphere_surface(&object->sphere, point); - - case RAY_OBJECT_TYPE_POINT: - return ray_object_point_surface(&object->point, point); - - case RAY_OBJECT_TYPE_PLANE: - return ray_object_plane_surface(&object->plane, point); - - case RAY_OBJECT_TYPE_LIGHT: - return ray_object_light_surface(&object->light, point); - default: - assert(0); - } -} diff --git a/src/modules/ray/ray_object.h b/src/modules/ray/ray_object.h index 7edf955..f4c3225 100644 --- a/src/modules/ray/ray_object.h +++ b/src/modules/ray/ray_object.h @@ -1,6 +1,8 @@ #ifndef _RAY_OBJECT_H #define _RAY_OBJECT_H +#include <assert.h> + #include "ray_object_light.h" #include "ray_object_plane.h" #include "ray_object_point.h" @@ -17,9 +19,94 @@ typedef union ray_object_t { ray_object_light_t light; } ray_object_t; -void ray_object_prepare(ray_object_t *object); -int ray_object_intersects_ray(ray_object_t *object, ray_ray_t *ray, float *res_distance); -ray_3f_t ray_object_normal(ray_object_t *object, ray_3f_t *point); -ray_surface_t ray_object_surface(ray_object_t *object, ray_3f_t *point); + + +/* Prepare an object for rendering. + * If the object has any pre-calculating to do, this is where it happens. + * The pre-calculated stuff is object-resident under a _prepared struct member. + */ +static inline void ray_object_prepare(ray_object_t *object) +{ + switch (object->type) { + case RAY_OBJECT_TYPE_SPHERE: + return ray_object_sphere_prepare(&object->sphere); + + case RAY_OBJECT_TYPE_POINT: + return ray_object_point_prepare(&object->point); + + case RAY_OBJECT_TYPE_PLANE: + return ray_object_plane_prepare(&object->plane); + + case RAY_OBJECT_TYPE_LIGHT: + return ray_object_light_prepare(&object->light); + default: + assert(0); + } +} + + +/* Determine if a ray intersects object. + * If the object is intersected, store where along the ray the intersection occurs in res_distance. + */ +static inline int ray_object_intersects_ray(ray_object_t *object, ray_ray_t *ray, float *res_distance) +{ + switch (object->type) { + case RAY_OBJECT_TYPE_SPHERE: + return ray_object_sphere_intersects_ray(&object->sphere, ray, res_distance); + + case RAY_OBJECT_TYPE_POINT: + return ray_object_point_intersects_ray(&object->point, ray, res_distance); + + case RAY_OBJECT_TYPE_PLANE: + return ray_object_plane_intersects_ray(&object->plane, ray, res_distance); + + case RAY_OBJECT_TYPE_LIGHT: + return ray_object_light_intersects_ray(&object->light, ray, res_distance); + default: + assert(0); + } +} + + +/* Return the surface normal of object @ point */ +static inline ray_3f_t ray_object_normal(ray_object_t *object, ray_3f_t *point) +{ + switch (object->type) { + case RAY_OBJECT_TYPE_SPHERE: + return ray_object_sphere_normal(&object->sphere, point); + + case RAY_OBJECT_TYPE_POINT: + return ray_object_point_normal(&object->point, point); + + case RAY_OBJECT_TYPE_PLANE: + return ray_object_plane_normal(&object->plane, point); + + case RAY_OBJECT_TYPE_LIGHT: + return ray_object_light_normal(&object->light, point); + default: + assert(0); + } +} + + +/* Return the surface of object @ point */ +static inline ray_surface_t ray_object_surface(ray_object_t *object, ray_3f_t *point) +{ + switch (object->type) { + case RAY_OBJECT_TYPE_SPHERE: + return ray_object_sphere_surface(&object->sphere, point); + + case RAY_OBJECT_TYPE_POINT: + return ray_object_point_surface(&object->point, point); + + case RAY_OBJECT_TYPE_PLANE: + return ray_object_plane_surface(&object->plane, point); + + case RAY_OBJECT_TYPE_LIGHT: + return ray_object_light_surface(&object->light, point); + default: + assert(0); + } +} #endif |