summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libdimension/Makefile.am2
-rw-r--r--libdimension/camera.c57
-rw-r--r--libdimension/cameras.c80
-rw-r--r--libdimension/dimension.h1
-rw-r--r--libdimension/dimension/cameras.h34
-rw-r--r--libdimensionxx/Makefile.am4
-rw-r--r--libdimensionxx/camera.cpp81
-rw-r--r--libdimensionxx/cameras.cpp39
-rw-r--r--libdimensionxx/dimensionxx.hpp2
-rw-r--r--libdimensionxx/dimensionxx/camera.hpp67
-rw-r--r--libdimensionxx/dimensionxx/cameras.hpp37
-rw-r--r--libdimensionxx/dimensionxx/object.hpp10
-rw-r--r--libdimensionxx/dimensionxx/objects.hpp12
13 files changed, 358 insertions, 68 deletions
diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am
index 8278d64..1cd2e0f 100644
--- a/libdimension/Makefile.am
+++ b/libdimension/Makefile.am
@@ -20,6 +20,7 @@
nobase_include_HEADERS = dimension.h \
dimension/array.h \
dimension/camera.h \
+ dimension/cameras.h \
dimension/canvas.h \
dimension/color.h \
dimension/error.h \
@@ -36,6 +37,7 @@ lib_LTLIBRARIES = libdimension.la
libdimension_la_SOURCES = $(nobase_include_HEADERS) \
array.c \
camera.c \
+ cameras.c \
canvas.c \
color.c \
error.c \
diff --git a/libdimension/camera.c b/libdimension/camera.c
index c353cbe..d842869 100644
--- a/libdimension/camera.c
+++ b/libdimension/camera.c
@@ -34,60 +34,3 @@ dmnsn_delete_camera(dmnsn_camera *camera)
{
free(camera);
}
-
-/* Perspective camera */
-
-/* Perspective camera ray callback */
-static dmnsn_line dmnsn_perspective_camera_ray_fn(const dmnsn_camera *camera,
- const dmnsn_canvas *canvas,
- unsigned int x,
- unsigned int y);
-
-/* Create a new perspective camera. Rays are aimed from the origin to a screen
- located on the z = 1 frame, from (-0.5, -0.5) to (0.5, 0.5). Rays are then
- transformed by the matrix `trans'. */
-dmnsn_camera *
-dmnsn_new_perspective_camera(dmnsn_matrix trans)
-{
- dmnsn_camera *camera = dmnsn_new_camera();
- if (camera) {
- camera->ray_fn = &dmnsn_perspective_camera_ray_fn;
-
- camera->ptr = malloc(sizeof(dmnsn_matrix));
- if (!camera->ptr) {
- dmnsn_delete_camera(camera);
- return NULL;
- }
- *((dmnsn_matrix*)camera->ptr) = trans;
- }
- return camera;
-}
-
-/* Delete a perspective camera */
-void
-dmnsn_delete_perspective_camera(dmnsn_camera *camera)
-{
- if (camera) {
- free(camera->ptr);
- dmnsn_delete_camera(camera);
- }
-}
-
-static dmnsn_line
-dmnsn_perspective_camera_ray_fn(const dmnsn_camera *camera,
- const dmnsn_canvas *canvas,
- unsigned int x, unsigned int y)
-{
- dmnsn_matrix *trans = (dmnsn_matrix *)camera->ptr;
- dmnsn_line l;
-
- /* Rays originate at the origin, oddly enough */
- l.x0 = dmnsn_vector_construct(0.0, 0.0, 0.0);
-
- /* Aim at the z = 1 plane */
- l.n.x = ((double)x)/(canvas->x - 1) - 0.5;
- l.n.y = ((double)y)/(canvas->y - 1) - 0.5;
- l.n.z = 1.0;
-
- return dmnsn_matrix_line_mul(*trans, l);
-}
diff --git a/libdimension/cameras.c b/libdimension/cameras.c
new file mode 100644
index 0000000..c6dcf59
--- /dev/null
+++ b/libdimension/cameras.c
@@ -0,0 +1,80 @@
+/*************************************************************************
+ * 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"
+
+/*
+ * Perspective camera
+ */
+
+/* Perspective camera ray callback */
+static dmnsn_line dmnsn_perspective_camera_ray_fn(const dmnsn_camera *camera,
+ const dmnsn_canvas *canvas,
+ unsigned int x,
+ unsigned int y);
+
+/* Create a new perspective camera. Rays are aimed from the origin to a screen
+ located on the z = 1 frame, from (-0.5, -0.5) to (0.5, 0.5). Rays are then
+ transformed by the matrix `trans'. */
+dmnsn_camera *
+dmnsn_new_perspective_camera(dmnsn_matrix trans)
+{
+ dmnsn_camera *camera = dmnsn_new_camera();
+ if (camera) {
+ camera->ray_fn = &dmnsn_perspective_camera_ray_fn;
+
+ camera->ptr = malloc(sizeof(dmnsn_matrix));
+ if (!camera->ptr) {
+ dmnsn_delete_camera(camera);
+ return NULL;
+ }
+ *((dmnsn_matrix*)camera->ptr) = trans;
+ }
+ return camera;
+}
+
+/* Delete a perspective camera */
+void
+dmnsn_delete_perspective_camera(dmnsn_camera *camera)
+{
+ if (camera) {
+ free(camera->ptr);
+ dmnsn_delete_camera(camera);
+ }
+}
+
+static dmnsn_line
+dmnsn_perspective_camera_ray_fn(const dmnsn_camera *camera,
+ const dmnsn_canvas *canvas,
+ unsigned int x, unsigned int y)
+{
+ dmnsn_matrix *trans = (dmnsn_matrix *)camera->ptr;
+ dmnsn_line l;
+
+ /* Rays originate at the origin, oddly enough */
+ l.x0 = dmnsn_vector_construct(0.0, 0.0, 0.0);
+
+ /* Aim at the z = 1 plane */
+ l.n.x = ((double)x)/(canvas->x - 1) - 0.5;
+ l.n.y = ((double)y)/(canvas->y - 1) - 0.5;
+ l.n.z = 1.0;
+
+ return dmnsn_matrix_line_mul(*trans, l);
+}
diff --git a/libdimension/dimension.h b/libdimension/dimension.h
index 327638f..5734616 100644
--- a/libdimension/dimension.h
+++ b/libdimension/dimension.h
@@ -61,6 +61,7 @@ extern "C" {
#include <dimension/object.h>
#include <dimension/objects.h>
#include <dimension/camera.h>
+#include <dimension/cameras.h>
#include <dimension/scene.h>
#include <dimension/raytrace.h>
diff --git a/libdimension/dimension/cameras.h b/libdimension/dimension/cameras.h
new file mode 100644
index 0000000..bd9d162
--- /dev/null
+++ b/libdimension/dimension/cameras.h
@@ -0,0 +1,34 @@
+/*************************************************************************
+ * 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/>. *
+ *************************************************************************/
+
+/*
+ * Types of cameras.
+ */
+
+#ifndef DIMENSION_CAMERAS_H
+#define DIMENSION_CAMERAS_H
+
+/* A perspective camera, at the origin, looking at (0, 0, 1). The feild of view
+ is the section of the plane z = 1 from (-0.5, -0.5) to (0.5, 0.5). Rays are
+ transformed by the transformation matrix `trans'. */
+dmnsn_camera *dmnsn_new_perspective_camera(dmnsn_matrix trans);
+void dmnsn_delete_perspective_camera(dmnsn_camera *camera);
+
+#endif /* DIMENSION_CAMERAS_H */
diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am
index b35ec97..cd14c99 100644
--- a/libdimensionxx/Makefile.am
+++ b/libdimensionxx/Makefile.am
@@ -20,6 +20,8 @@
nobase_include_HEADERS = dimensionxx.hpp \
dimensionxx/array.hpp \
dimensionxx/canvas.hpp \
+ dimensionxx/camera.hpp \
+ dimensionxx/cameras.hpp \
dimensionxx/color.hpp \
dimensionxx/cookie.hpp \
dimensionxx/geometry.hpp \
@@ -34,6 +36,8 @@ lib_LTLIBRARIES = libdimensionxx.la
libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) \
canvas.cpp \
+ camera.cpp \
+ cameras.cpp \
color.cpp \
error.cpp \
object.cpp \
diff --git a/libdimensionxx/camera.cpp b/libdimensionxx/camera.cpp
new file mode 100644
index 0000000..a5f894a
--- /dev/null
+++ b/libdimensionxx/camera.cpp
@@ -0,0 +1,81 @@
+/*************************************************************************
+ * 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
+{
+ // Pure virtual no-op destructor
+ Camera::~Camera()
+ { }
+
+ // Return the wrapped camera
+ dmnsn_camera*
+ Camera::dmnsn()
+ {
+ return m_camera;
+ }
+
+ // Return a const version of the wrapped canvas
+ const dmnsn_camera*
+ Camera::dmnsn() const
+ {
+ return m_camera;
+ }
+
+ // Protected default no-op constructor
+ Camera::Camera()
+ { }
+
+ // Protected manual constructor
+ Camera::Camera(dmnsn_camera *camera)
+ : m_camera(camera)
+ { }
+
+ // Custom camera callbacks
+ namespace {
+ dmnsn_line
+ ray_fn(const dmnsn_camera *camera, const dmnsn_canvas *canvas,
+ unsigned int x, unsigned int y)
+ {
+ Custom_Camera* ccamera = reinterpret_cast<Custom_Camera*>(camera->ptr);
+ // Yes the const_cast is ugly, but there's no other way because C++
+ // doesn't have `const' constructors. Luckily const Camera's treat their
+ // dmnsn_camera* as a const dmnsn_camera*.
+ return ccamera->ray(
+ Canvas(const_cast<dmnsn_canvas*>(canvas)), x, y
+ ).dmnsn();
+ }
+ }
+
+ // Initialize a new camera, using member functions as callbacks
+ Custom_Camera::Custom_Camera()
+ : Camera(dmnsn_new_camera())
+ {
+ m_camera->ptr = this;
+ m_camera->ray_fn = &ray_fn;
+ }
+
+ // Delete the camera
+ Custom_Camera::~Custom_Camera()
+ {
+ dmnsn_delete_camera(m_camera);
+ }
+}
diff --git a/libdimensionxx/cameras.cpp b/libdimensionxx/cameras.cpp
new file mode 100644
index 0000000..fb11dcf
--- /dev/null
+++ b/libdimensionxx/cameras.cpp
@@ -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/>. *
+ *************************************************************************/
+
+#include "dimensionxx.hpp"
+
+namespace Dimension
+{
+ // Create a sphere
+ Perspective_Camera::Perspective_Camera(const Matrix& trans)
+ : Camera(dmnsn_new_perspective_camera(trans.dmnsn()))
+ {
+ if (!m_camera) {
+ throw Dimension_Error("Failed to allocate perspective camera.");
+ }
+ }
+
+ // Delete a sphere
+ Perspective_Camera::~Perspective_Camera()
+ {
+ dmnsn_delete_perspective_camera(m_camera);
+ }
+}
diff --git a/libdimensionxx/dimensionxx.hpp b/libdimensionxx/dimensionxx.hpp
index c413d87..869556f 100644
--- a/libdimensionxx/dimensionxx.hpp
+++ b/libdimensionxx/dimensionxx.hpp
@@ -34,5 +34,7 @@
#include <dimensionxx/png.hpp>
#include <dimensionxx/object.hpp>
#include <dimensionxx/objects.hpp>
+#include <dimensionxx/camera.hpp>
+#include <dimensionxx/cameras.hpp>
#endif /* DIMENSIONXX_HPP */
diff --git a/libdimensionxx/dimensionxx/camera.hpp b/libdimensionxx/dimensionxx/camera.hpp
new file mode 100644
index 0000000..950e16d
--- /dev/null
+++ b/libdimensionxx/dimensionxx/camera.hpp
@@ -0,0 +1,67 @@
+/*************************************************************************
+ * 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_camera* wrapper.
+
+#ifndef DIMENSIONXX_CAMERA_HPP
+#define DIMENSIONXX_CAMERA_HPP
+
+namespace Dimension
+{
+ // Abstract base camera class. Wraps a dmnsn_camera*.
+ class Camera
+ {
+ public:
+ // No-op, made pure virtual
+ virtual ~Camera() = 0;
+
+ // Camera callback
+ virtual Line ray(const Canvas& canvas, unsigned int x, unsigned int y);
+
+ // Access the wrapped C camera.
+ dmnsn_camera* dmnsn();
+ const dmnsn_camera* dmnsn() const;
+
+ protected:
+ // No-op
+ Camera();
+ // Wrap an existing camera
+ explicit Camera(dmnsn_camera* camera);
+
+ dmnsn_camera* m_camera;
+
+ private:
+ // Copying prohibited
+ Camera(const Camera&);
+ Camera& operator=(const Camera&);
+ };
+
+ // A custom camera abstract base class, for creating your own camera types
+ class Custom_Camera : public Camera
+ {
+ public:
+ Custom_Camera();
+ virtual ~Custom_Camera();
+
+ virtual Line ray(const Canvas& canvas, unsigned int x, unsigned int y) = 0;
+ };
+}
+
+#endif /* DIMENSIONXX_CAMERA_HPP */
diff --git a/libdimensionxx/dimensionxx/cameras.hpp b/libdimensionxx/dimensionxx/cameras.hpp
new file mode 100644
index 0000000..85105cb
--- /dev/null
+++ b/libdimensionxx/dimensionxx/cameras.hpp
@@ -0,0 +1,37 @@
+/*************************************************************************
+ * 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/>. *
+ *************************************************************************/
+
+// Camera wrappers.
+
+#ifndef DIMENSIONXX_CAMERAS_HPP
+#define DIMENSIONXX_CAMERAS_HPP
+
+namespace Dimension
+{
+ // Perspective camera
+ class Perspective_Camera : public Camera
+ {
+ public:
+ Perspective_Camera(const Matrix& trans);
+ virtual ~Perspective_Camera();
+ };
+}
+
+#endif /* DIMENSIONXX_CAMERAS_HPP */
diff --git a/libdimensionxx/dimensionxx/object.hpp b/libdimensionxx/dimensionxx/object.hpp
index af9bbcd..1b9c848 100644
--- a/libdimensionxx/dimensionxx/object.hpp
+++ b/libdimensionxx/dimensionxx/object.hpp
@@ -61,12 +61,12 @@ namespace Dimension
// A custom object abstract base class, for creating your own object types
class Custom_Object : public Object
{
- public:
- Custom_Object();
- virtual ~Custom_Object();
+ public:
+ Custom_Object();
+ virtual ~Custom_Object();
- virtual Array<double> intersections(const Line& l) = 0;
- virtual bool inside(const Vector& point) = 0;
+ virtual Array<double> intersections(const Line& l) = 0;
+ virtual bool inside(const Vector& point) = 0;
};
}
diff --git a/libdimensionxx/dimensionxx/objects.hpp b/libdimensionxx/dimensionxx/objects.hpp
index 5d5fe46..89aab14 100644
--- a/libdimensionxx/dimensionxx/objects.hpp
+++ b/libdimensionxx/dimensionxx/objects.hpp
@@ -28,17 +28,17 @@ namespace Dimension
// Sphere object
class Sphere : public Object
{
- public:
- Sphere();
- virtual ~Sphere();
+ public:
+ Sphere();
+ virtual ~Sphere();
};
// A cube
class Cube : public Object
{
- public:
- Cube();
- virtual ~Cube();
+ public:
+ Cube();
+ virtual ~Cube();
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 08:21:24 +0000