diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | libdimension/Makefile.am | 4 | ||||
| -rw-r--r-- | libdimension/dimension.h | 1 | ||||
| -rw-r--r-- | libdimension/dimension/scene.h | 39 | ||||
| -rw-r--r-- | libdimension/scene.c | 74 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/raytrace.c | 52 |
7 files changed, 174 insertions, 4 deletions
@@ -22,7 +22,8 @@ Makefile.in /tests/error /tests/png /tests/pngxx -/tests/dimension*.png +/tests/raytrace +/tests/*.png # Files and folders created by libtool .libs/ diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index 136d652..857d233 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/canvas.h dimension/color.h dimension/error.h dimension/geometry.h dimension/png.h dimension/object.h dimension/sphere.h +nobase_include_HEADERS = dimension.h dimension/array.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 lib_LTLIBRARIES = libdimension.la -libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c canvas.c color.c error.c geometry.c png.c object.c sphere.c +libdimension_la_SOURCES = $(nobase_include_HEADERS) array.c canvas.c color.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/dimension.h b/libdimension/dimension.h index 50e1544..e7fbe55 100644 --- a/libdimension/dimension.h +++ b/libdimension/dimension.h @@ -32,6 +32,7 @@ extern "C" { #include <dimension/color.h> #include <dimension/canvas.h> #include <dimension/object.h> +#include <dimension/scene.h> #include <dimension/png.h> #ifdef __cplusplus diff --git a/libdimension/dimension/scene.h b/libdimension/dimension/scene.h new file mode 100644 index 0000000..e075cdd --- /dev/null +++ b/libdimension/dimension/scene.h @@ -0,0 +1,39 @@ +/************************************************************************* + * 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_SCENE_H +#define DIMENSION_SCENE_H + +/* + * A scene. + */ + +typedef struct { + dmnsn_color background; + dmnsn_array *objects; + dmnsn_canvas *canvas; +} dmnsn_scene; + +dmnsn_scene *dmnsn_new_scene(unsigned int x, unsigned int y); +void dmnsn_delete_scene(dmnsn_scene *scene); + +void dmnsn_raytrace_scene(dmnsn_scene *scene); + +#endif /* DIMENSION_SCENE_H */ diff --git a/libdimension/scene.c b/libdimension/scene.c new file mode 100644 index 0000000..541e3ba --- /dev/null +++ b/libdimension/scene.c @@ -0,0 +1,74 @@ +/************************************************************************* + * 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 */ + +dmnsn_scene * +dmnsn_new_scene(unsigned int x, unsigned int y) +{ + dmnsn_scene *scene = malloc(sizeof(dmnsn_scene)); + if (scene) { + scene->objects = dmnsn_new_array(sizeof(dmnsn_object*)); + + scene->canvas = dmnsn_new_canvas(x, y); + if (!scene->canvas) { + dmnsn_delete_array(scene->objects); + return NULL; + } + } + + return scene; +} + +void +dmnsn_delete_scene(dmnsn_scene *scene) +{ + if (scene) { + dmnsn_delete_array(scene->objects); + free(scene); + } +} + +void +dmnsn_raytrace_scene(dmnsn_scene *scene) +{ + unsigned int i, j; + dmnsn_object *object; + dmnsn_line l; + + l.x0 = dmnsn_vector_construct(0.0, 0.0, -3.0); + dmnsn_array_get(scene->objects, 0, &object); + + for (i = 0; i < scene->canvas->x; ++i) { + for (j = 0; j < scene->canvas->y; ++j) { + l.n.x = 1.6*(((double)i)/(scene->canvas->x - 1) - 0.5); + l.n.y = ((double)j)/(scene->canvas->y - 1) - 0.5; + l.n.z = 1.0; + + if ((*object->intersections_fn)(l)->length > 0) { + dmnsn_set_pixel(scene->canvas, i, j, + dmnsn_color_from_XYZ(dmnsn_whitepoint)); + } else { + dmnsn_set_pixel(scene->canvas, i, j, scene->background); + } + } + } +} diff --git a/tests/Makefile.am b/tests/Makefile.am index d4f94fc..513e57a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,7 +17,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## ########################################################################### -check_PROGRAMS = warning error png pngxx +check_PROGRAMS = warning error png pngxx raytrace TESTS = $(check_PROGRAMS) XFAIL_TESTS = error @@ -34,3 +34,6 @@ png_LDADD = ../libdimension/libdimension.la pngxx_SOURCES = pngxx.cpp pngxx_LDADD = ../libdimensionxx/libdimensionxx.la + +raytrace_SOURCES = raytrace.c +raytrace_LDADD = ../libdimension/libdimension.la diff --git a/tests/raytrace.c b/tests/raytrace.c new file mode 100644 index 0000000..7a5f3aa --- /dev/null +++ b/tests/raytrace.c @@ -0,0 +1,52 @@ +/************************************************************************* + * Copyright (C) 2008 Tavian Barnes <tavianator@gmail.com> * + * * + * This file is part of The Dimension Test Suite. * + * * + * Dimension 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. * + * * + * Dimension 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> +#include <stdio.h> + +int main() { + FILE *file; + dmnsn_scene *scene; + dmnsn_object *sphere; + dmnsn_sRGB sRGB; + dmnsn_color color; + + dmnsn_set_resilience(DMNSN_SEVERITY_LOW); + + scene = dmnsn_new_scene(768, 480); + + sRGB.R = 0.0; + sRGB.G = 0.0; + sRGB.B = 0.1; + color = dmnsn_color_from_sRGB(sRGB); + color.filter = 0.1; + scene->background = color; + + sphere = dmnsn_new_sphere(); + dmnsn_array_push(scene->objects, &sphere); + + dmnsn_raytrace_scene(scene); + + file = fopen("raytrace.png", "wb"); + dmnsn_png_write_canvas(scene->canvas, file); + + return EXIT_SUCCESS; +} |