summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-07-01 04:45:40 +0000
committerTavian Barnes <tavianator@gmail.com>2009-07-01 04:45:40 +0000
commitc19f7101d21353c8278dd9277dbb20a77389272d (patch)
treef9d1582e01cf754acc483f8877aa7bf217e36f1f
parent47c128a3106206038e45eb8b8abf6c712f29ac14 (diff)
downloaddimension-c19f7101d21353c8278dd9277dbb20a77389272d.tar.xz
New C++ dmnsn_scene* wrapper and raytracexx test.
-rw-r--r--.gitignore1
-rw-r--r--libdimensionxx/Makefile.am3
-rw-r--r--libdimensionxx/camera.cpp6
-rw-r--r--libdimensionxx/canvas.cpp4
-rw-r--r--libdimensionxx/dimensionxx.hpp1
-rw-r--r--libdimensionxx/dimensionxx/canvas.hpp12
-rw-r--r--libdimensionxx/dimensionxx/scene.hpp68
-rw-r--r--libdimensionxx/png.cpp1
-rw-r--r--libdimensionxx/scene.cpp114
-rw-r--r--tests/Makefile.am26
-rw-r--r--tests/pngxx.cpp32
-rw-r--r--tests/raytracexx.cpp71
12 files changed, 304 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index 4327b98..308771c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ Makefile.in
/tests/png
/tests/pngxx
/tests/raytrace
+/tests/raytracexx
/tests/*.png
# Files and folders created by libtool
diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am
index cd14c99..7f4ad85 100644
--- a/libdimensionxx/Makefile.am
+++ b/libdimensionxx/Makefile.am
@@ -43,7 +43,8 @@ libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) \
object.cpp \
objects.cpp \
png.cpp \
- progress.cpp
+ progress.cpp \
+ scene.cpp
if FOPENCOOKIE
libdimensionxx_la_SOURCES += cookie-fopencookie.cpp
diff --git a/libdimensionxx/camera.cpp b/libdimensionxx/camera.cpp
index a5f894a..2897dac 100644
--- a/libdimensionxx/camera.cpp
+++ b/libdimensionxx/camera.cpp
@@ -49,6 +49,12 @@ namespace Dimension
: m_camera(camera)
{ }
+ Line
+ Camera::ray(const Canvas& canvas, unsigned int x, unsigned int y)
+ {
+ return Line(m_camera->ray_fn(m_camera, canvas.dmnsn(), x, y));
+ }
+
// Custom camera callbacks
namespace {
dmnsn_line
diff --git a/libdimensionxx/canvas.cpp b/libdimensionxx/canvas.cpp
index 35ff2fb..c8b3389 100644
--- a/libdimensionxx/canvas.cpp
+++ b/libdimensionxx/canvas.cpp
@@ -26,6 +26,10 @@ namespace Dimension
Canvas::Canvas(unsigned int width, unsigned int height)
: m_canvas(dmnsn_new_canvas(width, height)) { }
+ // Wrap an existing dmnsn_canvas*
+ Canvas::Canvas(dmnsn_canvas* canvas)
+ : m_canvas(canvas) { }
+
// Virtual destructor: delete the canvas with dmnsn_delete_canvas().
Canvas::~Canvas()
{
diff --git a/libdimensionxx/dimensionxx.hpp b/libdimensionxx/dimensionxx.hpp
index 869556f..e8a7636 100644
--- a/libdimensionxx/dimensionxx.hpp
+++ b/libdimensionxx/dimensionxx.hpp
@@ -36,5 +36,6 @@
#include <dimensionxx/objects.hpp>
#include <dimensionxx/camera.hpp>
#include <dimensionxx/cameras.hpp>
+#include <dimensionxx/scene.hpp>
#endif /* DIMENSIONXX_HPP */
diff --git a/libdimensionxx/dimensionxx/canvas.hpp b/libdimensionxx/dimensionxx/canvas.hpp
index 84787ed..f519fbd 100644
--- a/libdimensionxx/dimensionxx/canvas.hpp
+++ b/libdimensionxx/dimensionxx/canvas.hpp
@@ -29,16 +29,14 @@ namespace Dimension
class Canvas
{
public:
- // Allocate a dmnsn_canvas specified width and height.
+ // Allocate a dmnsn_canvas of specified width and height
Canvas(unsigned int width, unsigned int height);
-
- // Wrap an existing canvas.
- explicit Canvas(dmnsn_canvas* canvas) : m_canvas(canvas) { }
-
- // Delete the canvas. (dmnsn_delete_canvas(m_canvas).)
+ // Wrap an existing canvas
+ explicit Canvas(dmnsn_canvas* canvas);
+ // Delete the canvas
virtual ~Canvas();
- // Get the width and height.
+ // Get the width and height
unsigned int width() const;
unsigned int height() const;
diff --git a/libdimensionxx/dimensionxx/scene.hpp b/libdimensionxx/dimensionxx/scene.hpp
new file mode 100644
index 0000000..4f906ef
--- /dev/null
+++ b/libdimensionxx/dimensionxx/scene.hpp
@@ -0,0 +1,68 @@
+/*************************************************************************
+ * 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/>. *
+ *************************************************************************/
+
+// dmnsn_scene* wrapper.
+
+#ifndef DIMENSIONXX_SCENE_HPP
+#define DIMENSIONXX_SCENE_HPP
+
+namespace Dimension
+{
+ // Base scene class. Wraps a dmnsn_scene*.
+ class Scene
+ {
+ public:
+ // Allocate a dmnsn_scene
+ Scene(const Color& background, Camera& camera, Canvas& canvas);
+ // Wrap an existing scene
+ explicit Scene(dmnsn_scene* scene);
+ // Delete the scene
+ ~Scene();
+
+ // Element access
+ Color background() const;
+ Camera& camera();
+ const Camera& camera() const;
+ Canvas& canvas();
+ const Canvas& canvas() const;
+
+ // Add objects
+ void push_object(Object& object);
+
+ // Render it!
+ void raytrace();
+ Progress raytrace_async();
+
+ // Access the wrapped C object.
+ dmnsn_scene* dmnsn();
+ const dmnsn_scene* dmnsn() const;
+
+ private:
+ // Copying prohibited
+ Scene(const Scene&);
+ Scene& operator=(const Scene&);
+
+ dmnsn_scene* m_scene;
+ Camera* m_camera;
+ Canvas* m_canvas;
+ };
+}
+
+#endif /* DIMENSIONXX_SCENE_HPP */
diff --git a/libdimensionxx/png.cpp b/libdimensionxx/png.cpp
index 9283105..b626269 100644
--- a/libdimensionxx/png.cpp
+++ b/libdimensionxx/png.cpp
@@ -20,7 +20,6 @@
#include "dimensionxx.hpp"
#include <cstdio>
-#include <stdexcept>
namespace Dimension
{
diff --git a/libdimensionxx/scene.cpp b/libdimensionxx/scene.cpp
new file mode 100644
index 0000000..5719207
--- /dev/null
+++ b/libdimensionxx/scene.cpp
@@ -0,0 +1,114 @@
+/*************************************************************************
+ * 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 "dimensionxx.hpp"
+
+namespace Dimension
+{
+ // Allocate a dmnsn_scene
+ Scene::Scene(const Color& background, Camera& camera, Canvas& canvas)
+ : m_scene(dmnsn_new_scene()), m_camera(&camera), m_canvas(&canvas)
+ {
+ if (!m_scene) {
+ throw Dimension_Error("Couldn't allocate scene.");
+ }
+
+ m_scene->background = background.dmnsn();
+ m_scene->camera = camera.dmnsn();
+ m_scene->canvas = canvas.dmnsn();
+ }
+
+ // Wrap an existing scene
+ Scene::Scene(dmnsn_scene* scene)
+ : m_scene(scene) { }
+
+ // Delete the scene
+ Scene::~Scene()
+ {
+ dmnsn_delete_scene(m_scene);
+ }
+
+ // Element access
+
+ Color
+ Scene::background() const
+ {
+ return Color(m_scene->background);
+ }
+
+ Camera&
+ Scene::camera()
+ {
+ return *m_camera;
+ }
+
+ const Camera&
+ Scene::camera() const
+ {
+ return *m_camera;
+ }
+
+ Canvas&
+ Scene::canvas()
+ {
+ return *m_canvas;
+ }
+
+ const Canvas&
+ Scene::canvas() const
+ {
+ return *m_canvas;
+ }
+
+ // Add objects
+ void
+ Scene::push_object(Object& object)
+ {
+ dmnsn_object* cobject = object.dmnsn();
+ dmnsn_array_push(m_scene->objects, &cobject);
+ }
+
+ // Render it!
+
+ void Scene::raytrace()
+ {
+ dmnsn_raytrace_scene(m_scene);
+ }
+
+ Progress
+ Scene::raytrace_async()
+ {
+ return Progress(dmnsn_raytrace_scene_async(m_scene));
+ }
+
+ // Access the wrapped C object.
+
+ dmnsn_scene*
+ Scene::dmnsn()
+ {
+ return m_scene;
+ }
+
+ const dmnsn_scene*
+ Scene::dmnsn() const
+ {
+ return m_scene;
+ }
+}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 35ed3d1..d6341e8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,8 @@ check_PROGRAMS = warning \
error \
png \
pngxx \
- raytrace
+ raytrace \
+ raytracexx
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = error
@@ -37,17 +38,20 @@ libdimensionxx_tests_la_SOURCES = testsxx.hpp \
testsxx.cpp
libdimensionxx_tests_la_LIBADD = ../libdimensionxx/libdimensionxx.la
-warning_SOURCES = warning.c
-warning_LDADD = ./libdimension-tests.la
+warning_SOURCES = warning.c
+warning_LDADD = ./libdimension-tests.la
-error_SOURCES = error.c
-error_LDADD = ./libdimension-tests.la
+error_SOURCES = error.c
+error_LDADD = ./libdimension-tests.la
-png_SOURCES = png.c
-png_LDADD = ./libdimension-tests.la
+png_SOURCES = png.c
+png_LDADD = ./libdimension-tests.la
-pngxx_SOURCES = pngxx.cpp
-pngxx_LDADD = ./libdimensionxx-tests.la
+pngxx_SOURCES = pngxx.cpp
+pngxx_LDADD = ./libdimensionxx-tests.la
-raytrace_SOURCES = raytrace.c
-raytrace_LDADD = ./libdimension-tests.la
+raytrace_SOURCES = raytrace.c
+raytrace_LDADD = ./libdimension-tests.la
+
+raytracexx_SOURCES = raytracexx.cpp
+raytracexx_LDADD = ./libdimensionxx-tests.la
diff --git a/tests/pngxx.cpp b/tests/pngxx.cpp
index c7cf0e0..bf297f6 100644
--- a/tests/pngxx.cpp
+++ b/tests/pngxx.cpp
@@ -26,25 +26,27 @@
int
main()
{
+ using namespace Dimension;
+
// Set the resilience low for tests
- Dimension::resilience(Dimension::SEVERITY_LOW);
+ resilience(SEVERITY_LOW);
const unsigned int width = 333, height = 300;
{
std::ofstream ofstr("dimensionxx1.png", std::ios::binary);
- Dimension::PNG_Canvas ocanvas(3*width, height, ofstr);
+ PNG_Canvas ocanvas(3*width, height, ofstr);
- Dimension::CIE_xyY xyY;
- Dimension::CIE_Lab Lab;
- Dimension::CIE_Luv Luv;
- Dimension::sRGB RGB;
- Dimension::Color color;
+ CIE_xyY xyY;
+ CIE_Lab Lab;
+ CIE_Luv Luv;
+ sRGB RGB;
+ Color color;
for (unsigned int x = 0; x < width; ++x) {
for (unsigned int y = 0; y < height; ++y) {
/* CIE xyY colorspace */
- xyY = Dimension::CIE_xyY(static_cast<double>(x)/(width - 1),
+ xyY = CIE_xyY(static_cast<double>(x)/(width - 1),
static_cast<double>(y)/(height - 1),
0.5);
color = xyY;
@@ -60,7 +62,7 @@ main()
/* CIE Lab colorspace */
- Lab = Dimension::CIE_Lab(75.0,
+ Lab = CIE_Lab(75.0,
200.0*(static_cast<double>(x)/
(width - 1) - 0.5),
200.0*(static_cast<double>(y)/
@@ -78,7 +80,7 @@ main()
/* CIE Luv colorspace */
- Luv = Dimension::CIE_Luv(75.0,
+ Luv = CIE_Luv(75.0,
200.0*(static_cast<double>(x)/
(width - 1) - 0.5),
200.0*(static_cast<double>(y)/
@@ -96,20 +98,20 @@ main()
}
}
- Dimension::Progress progress = ocanvas.write_async();
+ Progress progress = ocanvas.write_async();
std::cout << "Writing PNG file: " << progress << std::endl;
}
std::ifstream ifstr("dimensionxx1.png", std::ios::binary);
std::ofstream ofstr("dimensionxx2.png", std::ios::binary);
- Dimension::Progress iprogress
- = Dimension::PNG_Canvas::read_async(ifstr);
+ Progress iprogress
+ = PNG_Canvas::read_async(ifstr);
std::cout << "Reading PNG file: " << iprogress << std::endl;
- Dimension::PNG_Canvas iocanvas(iprogress, ofstr);
+ PNG_Canvas iocanvas(iprogress, ofstr);
- Dimension::Progress oprogress = iocanvas.write_async();
+ Progress oprogress = iocanvas.write_async();
std::cout << "Writing PNG file: " << oprogress << std::endl;
return 0;
diff --git a/tests/raytracexx.cpp b/tests/raytracexx.cpp
new file mode 100644
index 0000000..2b5c4e0
--- /dev/null
+++ b/tests/raytracexx.cpp
@@ -0,0 +1,71 @@
+/*************************************************************************
+ * 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 "testsxx.hpp"
+#include <fstream>
+#include <iostream>
+
+int
+main() {
+ using namespace Dimension;
+
+ // Set the resilience low for tests
+ resilience(SEVERITY_LOW);
+
+ // Background color
+ Color background = sRGB(0.0, 0.1, 0.25);
+ background.filter(0.1);
+
+ // Canvas
+ std::ofstream file("raytracexx.png");
+ PNG_Canvas canvas(768, 480, file);
+
+ Perspective_Camera camera(
+ Matrix::rotation(Vector(0.0, 1.0, 0.0))
+ * Matrix::translation(Vector(0.0, 0.0, -4.0))
+ * Matrix::scale(
+ Vector(static_cast<double>(canvas.width())/canvas.height(), 1.0, 1.0)
+ )
+ );
+
+ Scene scene(background, camera, canvas);
+
+ // Objects in scene
+
+ Sphere sphere;
+ sphere.trans(inverse(Matrix::scale(Vector(1.25, 1.25, 1.25))));
+ scene.push_object(sphere);
+
+ Cube cube;
+ cube.trans(inverse(Matrix::rotation(Vector(0.75, 0.0, 0.0))));
+ scene.push_object(cube);
+
+ // Render the scene
+ {
+ Progress rprogress = scene.raytrace_async();
+ std::cout << "Raytracing scene: " << rprogress << std::endl;
+ }
+
+ // Write the canvas
+ Progress wprogress = canvas.write_async();
+ std::cout << "Writing PNG file: " << wprogress << std::endl;
+
+ return EXIT_SUCCESS;
+}