summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libdimension/Makefile.am4
-rw-r--r--libdimension/cube.c113
-rw-r--r--libdimension/dimension.h1
-rw-r--r--libdimension/dimension/cube.h31
-rw-r--r--tests/raytrace.c29
5 files changed, 165 insertions, 13 deletions
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index 29bc268..91d0af0 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -17,10 +17,10 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ##
###########################################################################
-nobase_include_HEADERS = dimension.h dimension/array.h dimension/camera.h dimension/canvas.h dimension/color.h dimension/error.h dimension/geometry.h dimension/png.h dimension/object.h dimension/scene.h dimension/sphere.h
+nobase_include_HEADERS = dimension.h dimension/array.h dimension/camera.h dimension/canvas.h dimension/color.h dimension/cube.h dimension/error.h dimension/geometry.h dimension/png.h dimension/object.h dimension/scene.h dimension/sphere.h
lib_LTLIBRARIES = libdimension.la
-libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c camera.c canvas.c color.c error.c geometry.c png.c object.c scene.c sphere.c
+libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c camera.c canvas.c color.c cube.c error.c geometry.c png.c object.c scene.c sphere.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
new file mode 100644
index 0000000..197a0f8
--- /dev/null
+++ b/libdimension/cube.c
@@ -0,0 +1,113 @@
+/*************************************************************************
+ * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> *
+ * *
+ * 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 *
+ * <http://www.gnu.org/licenses/>. *
+ *************************************************************************/
+
+#include "dimension.h"
+#include <stdlib.h> /* For malloc */
+#include <math.h> /* 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);
+
+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;
+}
+
+void
+dmnsn_delete_cube(dmnsn_object *cube)
+{
+ dmnsn_delete_object(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;
+}
+
+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 3eb0bae..ba47487 100644
--- a/libdimension/dimension.h
+++ b/libdimension/dimension.h
@@ -33,6 +33,7 @@ extern "C" {
#include <dimension/canvas.h>
#include <dimension/object.h>
#include <dimension/sphere.h>
+#include <dimension/cube.h>
#include <dimension/camera.h>
#include <dimension/scene.h>
#include <dimension/png.h>
diff --git a/libdimension/dimension/cube.h b/libdimension/dimension/cube.h
new file mode 100644
index 0000000..e7f2b90
--- /dev/null
+++ b/libdimension/dimension/cube.h
@@ -0,0 +1,31 @@
+/*************************************************************************
+ * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> *
+ * *
+ * 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 *
+ * <http://www.gnu.org/licenses/>. *
+ *************************************************************************/
+
+#ifndef DIMENSION_CUBE_H
+#define DIMENSION_CUBE_H
+
+/*
+ * 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_CUBE_H */
diff --git a/tests/raytrace.c b/tests/raytrace.c
index 89a0fcd..1fbf837 100644
--- a/tests/raytrace.c
+++ b/tests/raytrace.c
@@ -25,24 +25,31 @@
int main() {
FILE *file;
dmnsn_scene *scene;
- dmnsn_object *sphere;
+ dmnsn_object *object;
dmnsn_sRGB sRGB;
dmnsn_color color;
+ dmnsn_matrix trans;
dmnsn_set_resilience(DMNSN_SEVERITY_LOW);
scene = dmnsn_new_scene();
scene->canvas = dmnsn_new_canvas(768, 480);
- scene->camera = dmnsn_new_perspective_camera(
- dmnsn_matrix_mul(
- dmnsn_translation_matrix(dmnsn_vector_construct(0.0, 0.0, -3.0)),
- dmnsn_scale_matrix(
- dmnsn_vector_construct(
- ((double)scene->canvas->x)/scene->canvas->y, 1.0, 1.0
- )
- )
+
+ trans = dmnsn_scale_matrix(
+ dmnsn_vector_construct(
+ ((double)scene->canvas->x)/scene->canvas->y, 1.0, 1.0
)
);
+ trans = dmnsn_matrix_mul(
+ dmnsn_translation_matrix(dmnsn_vector_construct(0.0, 0.0, -4.0)),
+ trans
+ );
+ trans = dmnsn_matrix_mul(
+ dmnsn_rotation_matrix(dmnsn_vector_construct(0.0, 1.0, 0.0)),
+ trans
+ );
+
+ scene->camera = dmnsn_new_perspective_camera(trans);
sRGB.R = 0.0;
sRGB.G = 0.0;
@@ -51,8 +58,8 @@ int main() {
color.filter = 0.1;
scene->background = color;
- sphere = dmnsn_new_sphere();
- dmnsn_array_push(scene->objects, &sphere);
+ object = dmnsn_new_cube();
+ dmnsn_array_push(scene->objects, &object);
dmnsn_raytrace_scene(scene);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 04:08:34 +0000