summaryrefslogtreecommitdiffstats
path: root/libdimensionxx
diff options
context:
space:
mode:
Diffstat (limited to 'libdimensionxx')
-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
8 files changed, 200 insertions, 9 deletions
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;
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 15:03:26 +0000