From e957408cb8cd200696a081b4f5c749c5294110ec Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 1 Jul 2009 04:44:51 +0000 Subject: Sphere and cube C++ wrappers. --- libdimension/Makefile.am | 10 +-- libdimension/cube.c | 94 -------------------- libdimension/dimension.h | 5 +- libdimension/dimension/cube.h | 31 ------- libdimension/dimension/objects.h | 36 ++++++++ libdimension/dimension/sphere.h | 31 ------- libdimension/objects.c | 181 +++++++++++++++++++++++++++++++++++++++ libdimension/sphere.c | 78 ----------------- 8 files changed, 223 insertions(+), 243 deletions(-) delete mode 100644 libdimension/dimension/cube.h create mode 100644 libdimension/dimension/objects.h delete mode 100644 libdimension/dimension/sphere.h create mode 100644 libdimension/objects.c delete mode 100644 libdimension/sphere.c (limited to 'libdimension') diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index 125ad77..8278d64 100644 --- a/libdimension/Makefile.am +++ b/libdimension/Makefile.am @@ -22,15 +22,14 @@ nobase_include_HEADERS = dimension.h \ dimension/camera.h \ dimension/canvas.h \ dimension/color.h \ - dimension/cube.h \ dimension/error.h \ dimension/geometry.h \ dimension/png.h \ dimension/progress.h \ dimension/object.h \ + dimension/objects.h \ dimension/raytrace.h \ - dimension/scene.h \ - dimension/sphere.h + dimension/scene.h lib_LTLIBRARIES = libdimension.la @@ -39,15 +38,14 @@ libdimension_la_SOURCES = $(nobase_include_HEADERS) \ camera.c \ canvas.c \ color.c \ - cube.c \ error.c \ geometry.c \ inlines.c \ png.c \ progress.c \ object.c \ + objects.c \ raytrace.c \ - scene.c \ - sphere.c + scene.c libdimension_la_LDFLAGS = -version-info 0:0:0 libdimension_la_LIBADD = -lm -lpthread -lpng diff --git a/libdimension/cube.c b/libdimension/cube.c index bb71d0b..d8a1236 100644 --- a/libdimension/cube.c +++ b/libdimension/cube.c @@ -21,97 +21,3 @@ #include "dimension.h" #include /* For malloc */ #include /* For sqrt */ - -static dmnsn_array *dmnsn_cube_intersections_fn(const dmnsn_object *cube, - dmnsn_line line); -static int dmnsn_cube_inside_fn(const dmnsn_object *cube, - dmnsn_vector point); - -/* Allocate a new cube object */ -dmnsn_object * -dmnsn_new_cube() -{ - dmnsn_object *cube = dmnsn_new_object(); - if (cube) { - cube->intersections_fn = &dmnsn_cube_intersections_fn; - cube->inside_fn = &dmnsn_cube_inside_fn; - } - return cube; -} - -/* Delete a cube */ -void -dmnsn_delete_cube(dmnsn_object *cube) -{ - dmnsn_delete_object(cube); -} - -/* Intersections callback for a cube */ -static dmnsn_array * -dmnsn_cube_intersections_fn(const dmnsn_object *cube, dmnsn_line line) -{ - double t; - dmnsn_vector p; - dmnsn_array *array = dmnsn_new_array(sizeof(double)); - - /* Six ray-plane intersection tests (x, y, z) = +/- 1.0 */ - - if (line.n.x != 0.0) { - /* x = -1.0 */ - t = (-1.0 - line.x0.x)/line.n.x; - p = dmnsn_line_point(line, t); - if (p.y >= -1.0 && p.y <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { - dmnsn_array_push(array, &t); - } - - /* x = 1.0 */ - t = (1.0 - line.x0.x)/line.n.x; - p = dmnsn_line_point(line, t); - if (p.y >= -1.0 && p.y <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { - dmnsn_array_push(array, &t); - } - } - - if (line.n.y != 0.0) { - /* y = -1.0 */ - t = (-1.0 - line.x0.y)/line.n.y; - p = dmnsn_line_point(line, t); - if (p.x >= -1.0 && p.x <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { - dmnsn_array_push(array, &t); - } - - /* y = 1.0 */ - t = (1.0 - line.x0.y)/line.n.y; - p = dmnsn_line_point(line, t); - if (p.x >= -1.0 && p.x <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { - dmnsn_array_push(array, &t); - } - } - - if (line.n.z != 0.0) { - /* z = -1.0 */ - t = (-1.0 - line.x0.z)/line.n.z; - p = dmnsn_line_point(line, t); - if (p.x >= -1.0 && p.x <= 1.0 && p.y >= -1.0 && p.y <= 1.0) { - dmnsn_array_push(array, &t); - } - - /* z = 1.0 */ - t = (1.0 - line.x0.z)/line.n.z; - p = dmnsn_line_point(line, t); - if (p.x >= -1.0 && p.x <= 1.0 && p.y >= -1.0 && p.y <= 1.0) { - dmnsn_array_push(array, &t); - } - } - - return array; -} - -/* Inside callback for a cube */ -static int -dmnsn_cube_inside_fn(const dmnsn_object *cube, dmnsn_vector point) -{ - return point.x > -1.0 && point.x < 1.0 - && point.y > -1.0 && point.y < 1.0 - && point.z > -1.0 && point.z < 1.0; -} diff --git a/libdimension/dimension.h b/libdimension/dimension.h index 4157f8b..327638f 100644 --- a/libdimension/dimension.h +++ b/libdimension/dimension.h @@ -57,13 +57,12 @@ extern "C" { #include #include #include +#include #include - #include - #include +#include #include #include #include -#include #ifdef __cplusplus } diff --git a/libdimension/dimension/cube.h b/libdimension/dimension/cube.h deleted file mode 100644 index e55ec74..0000000 --- a/libdimension/dimension/cube.h +++ /dev/null @@ -1,31 +0,0 @@ -/************************************************************************* - * Copyright (C) 2008 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension Library is free software; you can redistribute it and/ * - * or modify it under the terms of the GNU Lesser General Public License * - * as published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Library is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -/* - * A cube, axis-aligned, from (-1, -1, -1) to (1, 1, 1) - */ - -#ifndef DIMENSION_CUBE_H -#define DIMENSION_CUBE_H - -dmnsn_object *dmnsn_new_cube(); -void dmnsn_delete_cube(dmnsn_object *cube); - -#endif /* DIMENSION_CUBE_H */ diff --git a/libdimension/dimension/objects.h b/libdimension/dimension/objects.h new file mode 100644 index 0000000..4eb8fe8 --- /dev/null +++ b/libdimension/dimension/objects.h @@ -0,0 +1,36 @@ +/************************************************************************* + * Copyright (C) 2008 Tavian Barnes * + * * + * This file is part of The Dimension Library. * + * * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this program. If not, see * + * . * + *************************************************************************/ + +/* + * Custom objects. + */ + +#ifndef DIMENSION_OBJECTS_H +#define DIMENSION_OBJECTS_H + +/* A sphere object, of radius 1, centered at the origin. */ +dmnsn_object *dmnsn_new_sphere(); +void dmnsn_delete_sphere(dmnsn_object *sphere); + +/* A cube, axis-aligned, from (-1, -1, -1) to (1, 1, 1) */ +dmnsn_object *dmnsn_new_cube(); +void dmnsn_delete_cube(dmnsn_object *cube); + +#endif /* DIMENSION_OBJECTS_H */ diff --git a/libdimension/dimension/sphere.h b/libdimension/dimension/sphere.h deleted file mode 100644 index d7a8f54..0000000 --- a/libdimension/dimension/sphere.h +++ /dev/null @@ -1,31 +0,0 @@ -/************************************************************************* - * Copyright (C) 2008 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension Library is free software; you can redistribute it and/ * - * or modify it under the terms of the GNU Lesser General Public License * - * as published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Library is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -/* - * A sphere object, of radius 1, centered at the origin. - */ - -#ifndef DIMENSION_SPHERE_H -#define DIMENSION_SPHERE_H - -dmnsn_object *dmnsn_new_sphere(); -void dmnsn_delete_sphere(dmnsn_object *sphere); - -#endif /* DIMENSION_SPHERE_H */ diff --git a/libdimension/objects.c b/libdimension/objects.c new file mode 100644 index 0000000..b5cf64c --- /dev/null +++ b/libdimension/objects.c @@ -0,0 +1,181 @@ +/************************************************************************* + * Copyright (C) 2008 Tavian Barnes * + * * + * This file is part of The Dimension Library. * + * * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this program. If not, see * + * . * + *************************************************************************/ + +#include "dimension.h" +#include /* For malloc */ +#include /* For sqrt */ + +/* + * Sphere + */ + +/* Sphere object callbacks */ +static dmnsn_array *dmnsn_sphere_intersections_fn(const dmnsn_object *sphere, + dmnsn_line line); +static int dmnsn_sphere_inside_fn(const dmnsn_object *sphere, + dmnsn_vector point); + +/* Allocate a new sphere */ +dmnsn_object * +dmnsn_new_sphere() +{ + dmnsn_object *sphere = dmnsn_new_object(); + if (sphere) { + sphere->intersections_fn = &dmnsn_sphere_intersections_fn; + sphere->inside_fn = &dmnsn_sphere_inside_fn; + } + return sphere; +} + +/* Free a sphere */ +void +dmnsn_delete_sphere(dmnsn_object *sphere) +{ + dmnsn_delete_object(sphere); +} + +/* Return a list of insersections of `line' with a sphere */ +static dmnsn_array * +dmnsn_sphere_intersections_fn(const dmnsn_object *sphere, dmnsn_line line) +{ + double a, b, c, t[2]; + dmnsn_array *array = dmnsn_new_array(sizeof(double)); + + /* Solve (x0 + nx*t)^2 + (y0 + ny*t)^2 + (z0 + nz*t)^2 == 1 */ + + a = line.n.x*line.n.x + line.n.y*line.n.y + line.n.z*line.n.z; + b = 2.0*(line.n.x*line.x0.x + line.n.y*line.x0.y + line.n.z*line.x0.z); + c = line.x0.x*line.x0.x + line.x0.y*line.x0.y + line.x0.z*line.x0.z - 1.0; + + if (b*b - 4.0*a*c >= 0) { + t[0] = (-b + sqrt(b*b - 4.0*a*c))/(2*a); + t[1] = (-b - sqrt(b*b - 4.0*a*c))/(2*a); + dmnsn_array_set(array, 0, &t[0]); + dmnsn_array_set(array, 1, &t[1]); + } + + return array; +} + +/* Return whether a point is inside a sphere (x**2 + y**2 + z**2 < 1.0) */ +static int +dmnsn_sphere_inside_fn(const dmnsn_object *sphere, dmnsn_vector point) +{ + return point.x*point.x + point.y*point.y + point.z*point.z < 1.0; +} + +/* + * Cube + */ + +/* Cube callbacks */ +static dmnsn_array *dmnsn_cube_intersections_fn(const dmnsn_object *cube, + dmnsn_line line); +static int dmnsn_cube_inside_fn(const dmnsn_object *cube, + dmnsn_vector point); + +/* Allocate a new cube object */ +dmnsn_object * +dmnsn_new_cube() +{ + dmnsn_object *cube = dmnsn_new_object(); + if (cube) { + cube->intersections_fn = &dmnsn_cube_intersections_fn; + cube->inside_fn = &dmnsn_cube_inside_fn; + } + return cube; +} + +/* Delete a cube */ +void +dmnsn_delete_cube(dmnsn_object *cube) +{ + dmnsn_delete_object(cube); +} + +/* Intersections callback for a cube */ +static dmnsn_array * +dmnsn_cube_intersections_fn(const dmnsn_object *cube, dmnsn_line line) +{ + double t; + dmnsn_vector p; + dmnsn_array *array = dmnsn_new_array(sizeof(double)); + + /* Six ray-plane intersection tests (x, y, z) = +/- 1.0 */ + + if (line.n.x != 0.0) { + /* x = -1.0 */ + t = (-1.0 - line.x0.x)/line.n.x; + p = dmnsn_line_point(line, t); + if (p.y >= -1.0 && p.y <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { + dmnsn_array_push(array, &t); + } + + /* x = 1.0 */ + t = (1.0 - line.x0.x)/line.n.x; + p = dmnsn_line_point(line, t); + if (p.y >= -1.0 && p.y <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { + dmnsn_array_push(array, &t); + } + } + + if (line.n.y != 0.0) { + /* y = -1.0 */ + t = (-1.0 - line.x0.y)/line.n.y; + p = dmnsn_line_point(line, t); + if (p.x >= -1.0 && p.x <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { + dmnsn_array_push(array, &t); + } + + /* y = 1.0 */ + t = (1.0 - line.x0.y)/line.n.y; + p = dmnsn_line_point(line, t); + if (p.x >= -1.0 && p.x <= 1.0 && p.z >= -1.0 && p.z <= 1.0) { + dmnsn_array_push(array, &t); + } + } + + if (line.n.z != 0.0) { + /* z = -1.0 */ + t = (-1.0 - line.x0.z)/line.n.z; + p = dmnsn_line_point(line, t); + if (p.x >= -1.0 && p.x <= 1.0 && p.y >= -1.0 && p.y <= 1.0) { + dmnsn_array_push(array, &t); + } + + /* z = 1.0 */ + t = (1.0 - line.x0.z)/line.n.z; + p = dmnsn_line_point(line, t); + if (p.x >= -1.0 && p.x <= 1.0 && p.y >= -1.0 && p.y <= 1.0) { + dmnsn_array_push(array, &t); + } + } + + return array; +} + +/* Inside callback for a cube */ +static int +dmnsn_cube_inside_fn(const dmnsn_object *cube, dmnsn_vector point) +{ + return point.x > -1.0 && point.x < 1.0 + && point.y > -1.0 && point.y < 1.0 + && point.z > -1.0 && point.z < 1.0; +} diff --git a/libdimension/sphere.c b/libdimension/sphere.c deleted file mode 100644 index f6950dc..0000000 --- a/libdimension/sphere.c +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * Copyright (C) 2008 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension Library is free software; you can redistribute it and/ * - * or modify it under the terms of the GNU Lesser General Public License * - * as published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Library is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -#include "dimension.h" -#include /* For malloc */ -#include /* For sqrt */ - -/* Sphere object callbacks */ -static dmnsn_array *dmnsn_sphere_intersections_fn(const dmnsn_object *sphere, - dmnsn_line line); -static int dmnsn_sphere_inside_fn(const dmnsn_object *sphere, - dmnsn_vector point); - -/* Allocate a new sphere */ -dmnsn_object * -dmnsn_new_sphere() -{ - dmnsn_object *sphere = dmnsn_new_object(); - if (sphere) { - sphere->intersections_fn = &dmnsn_sphere_intersections_fn; - sphere->inside_fn = &dmnsn_sphere_inside_fn; - } - return sphere; -} - -/* Free a sphere */ -void -dmnsn_delete_sphere(dmnsn_object *sphere) -{ - dmnsn_delete_object(sphere); -} - -/* Return a list of insersections of `line' with a sphere */ -static dmnsn_array * -dmnsn_sphere_intersections_fn(const dmnsn_object *sphere, dmnsn_line line) -{ - double a, b, c, t[2]; - dmnsn_array *array = dmnsn_new_array(sizeof(double)); - - /* Solve (x0 + nx*t)^2 + (y0 + ny*t)^2 + (z0 + nz*t)^2 == 1 */ - - a = line.n.x*line.n.x + line.n.y*line.n.y + line.n.z*line.n.z; - b = 2.0*(line.n.x*line.x0.x + line.n.y*line.x0.y + line.n.z*line.x0.z); - c = line.x0.x*line.x0.x + line.x0.y*line.x0.y + line.x0.z*line.x0.z - 1.0; - - if (b*b - 4.0*a*c >= 0) { - t[0] = (-b + sqrt(b*b - 4.0*a*c))/(2*a); - t[1] = (-b - sqrt(b*b - 4.0*a*c))/(2*a); - dmnsn_array_set(array, 0, &t[0]); - dmnsn_array_set(array, 1, &t[1]); - } - - return array; -} - -/* Return whether a point is inside a sphere (x**2 + y**2 + z**2 < 1.0) */ -static int -dmnsn_sphere_inside_fn(const dmnsn_object *sphere, dmnsn_vector point) -{ - return point.x*point.x + point.y*point.y + point.z*point.z < 1.0; -} -- cgit v1.2.3