summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-06-20 16:44:19 +0000
committerTavian Barnes <tavianator@gmail.com>2009-06-20 16:44:19 +0000
commitc4b1e00954c6934b081cbf3b26c55222b351cc46 (patch)
treebef427e3e5ccb67813ba78b136e1072bc8330301
parent9d46468507031d2435f5b93d57c3d89cd25d0c97 (diff)
downloaddimension-c4b1e00954c6934b081cbf3b26c55222b351cc46.tar.xz
New C++ dmnsn_array* and dmnsn_object* wrappers.
-rw-r--r--libdimensionxx/Makefile.am4
-rw-r--r--libdimensionxx/dimensionxx.hpp2
-rw-r--r--libdimensionxx/dimensionxx/array.hpp108
-rw-r--r--libdimensionxx/dimensionxx/geometry.hpp1
-rw-r--r--libdimensionxx/dimensionxx/object.hpp68
-rw-r--r--libdimensionxx/object.cpp92
6 files changed, 273 insertions, 2 deletions
diff --git a/libdimensionxx/Makefile.am b/libdimensionxx/Makefile.am
index 862f72c..1e19d28 100644
--- a/libdimensionxx/Makefile.am
+++ b/libdimensionxx/Makefile.am
@@ -17,13 +17,13 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ##
###########################################################################
-nobase_include_HEADERS = dimensionxx.hpp dimensionxx/canvas.hpp dimensionxx/color.hpp dimensionxx/cookie.hpp dimensionxx/geometry.hpp dimensionxx/png.hpp
+nobase_include_HEADERS = dimensionxx.hpp dimensionxx/array.hpp dimensionxx/canvas.hpp dimensionxx/color.hpp dimensionxx/cookie.hpp dimensionxx/geometry.hpp dimensionxx/object.hpp dimensionxx/png.hpp
INCLUDES = -I../libdimension
lib_LTLIBRARIES = libdimensionxx.la
-libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) canvas.cpp color.cpp error.cpp png.cpp
+libdimensionxx_la_SOURCES = $(nobase_include_HEADERS) canvas.cpp color.cpp error.cpp object.cpp png.cpp
if FOPENCOOKIE
libdimensionxx_la_SOURCES += cookie-fopencookie.cpp
diff --git a/libdimensionxx/dimensionxx.hpp b/libdimensionxx/dimensionxx.hpp
index bfa0b06..37ecc13 100644
--- a/libdimensionxx/dimensionxx.hpp
+++ b/libdimensionxx/dimensionxx.hpp
@@ -26,9 +26,11 @@
// libdimension wrappers
#include <dimensionxx/error.hpp>
+#include <dimensionxx/array.hpp>
#include <dimensionxx/geometry.hpp>
#include <dimensionxx/color.hpp>
#include <dimensionxx/canvas.hpp>
+#include <dimensionxx/object.hpp>
#include <dimensionxx/png.hpp>
#endif /* DIMENSIONXX_HPP */
diff --git a/libdimensionxx/dimensionxx/array.hpp b/libdimensionxx/dimensionxx/array.hpp
new file mode 100644
index 0000000..6f8c59a
--- /dev/null
+++ b/libdimensionxx/dimensionxx/array.hpp
@@ -0,0 +1,108 @@
+/*************************************************************************
+ * 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 DIMENSIONXX_ARRAY_HPP
+#define DIMENSIONXX_ARRAY_HPP
+
+#include <tr1/memory>
+
+// dmnsn_array* wrapper.
+
+namespace Dimension
+{
+ // Array template class, wraps a dmnsn_array*. Copying is possible, but
+ // copies refer to the same object, which is reference counted. T must be
+ // a POD type.
+ template <typename T>
+ class Array
+ {
+ public:
+ Array();
+ explicit Array(dmnsn_array* array);
+ // Array(const Array& a);
+ ~Array();
+
+ // Array& operator=(const Array& a);
+
+ // Access the wrapped C object.
+ dmnsn_array* dmnsn() { return *m_array; }
+ const dmnsn_array* dmnsn() const { return *m_array; }
+
+ // Release ownership of the dmnsn_array*, needed for returning a
+ // dmnsn_array* from a function.
+ dmnsn_array* release();
+
+ private:
+ std::tr1::shared_ptr<dmnsn_array*> m_array;
+ };
+
+ // A constraint enforcing that T is a POD type by making it part of a union.
+ // Taking the address of this function will cause a compile-time failure if
+ // T is not a POD type.
+ template <typename T>
+ void
+ POD_constraint()
+ {
+ union
+ {
+ T t;
+ } constraint;
+ static_cast<void>(constraint); // Silence unused variable warning
+ }
+
+ template <typename T>
+ Array<T>::Array()
+ : m_array(new dmnsn_array*(dmnsn_new_array(sizeof(T))))
+ {
+ void (*constraint)() = &POD_constraint<T>;
+ static_cast<void>(constraint); // Silence unused variable warning
+ }
+
+ template <typename T>
+ Array<T>::Array(dmnsn_array* array)
+ : m_array(new dmnsn_array*(array))
+ {
+ void (*constraint)() = &POD_constraint<T>;
+ static_cast<void>(constraint); // Silence unused variable warning
+ }
+
+ template <typename T>
+ Array<T>::~Array()
+ {
+ if (m_array.unique()) {
+ dmnsn_delete_array(*m_array);
+ }
+ }
+
+ template <typename T>
+ dmnsn_array*
+ Array<T>::release()
+ {
+ if (!m_array.unique()) {
+ throw Dimension_Error("Attempting to release non-unique array.");
+ }
+
+ dmnsn_array* array = *m_array;
+ m_array.reset();
+ return array;
+ }
+}
+
+#endif /* DIMENSIONXX_ARRAY_HPP */
diff --git a/libdimensionxx/dimensionxx/geometry.hpp b/libdimensionxx/dimensionxx/geometry.hpp
index 63a666b..f623eda 100644
--- a/libdimensionxx/dimensionxx/geometry.hpp
+++ b/libdimensionxx/dimensionxx/geometry.hpp
@@ -104,6 +104,7 @@ namespace Dimension
Line() { }
Line(const Vector& x0, const Vector& n)
{ m_line.x0 = x0.dmnsn(); m_line.n = n.dmnsn(); }
+ explicit Line(dmnsn_line l) : m_line(l) { }
// Line(const Line& l);
// ~Line();
diff --git a/libdimensionxx/dimensionxx/object.hpp b/libdimensionxx/dimensionxx/object.hpp
new file mode 100644
index 0000000..3b2c6c1
--- /dev/null
+++ b/libdimensionxx/dimensionxx/object.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/>. *
+ *************************************************************************/
+
+#ifndef DIMENSIONXX_OBJECT_HPP
+#define DIMENSIONXX_OBJECT_HPP
+
+// dmnsn_object* wrapper.
+
+namespace Dimension
+{
+ // Abstract base object class. Wraps a dmnsn_object*.
+ class Object
+ {
+ public:
+ // No-op, made pure virtual
+ virtual ~Object() = 0;
+
+ virtual Array<double> intersections(const Line& l);
+ virtual bool inside(const Vector& point);
+
+ // Access the wrapped C object.
+ dmnsn_object* dmnsn();
+ const dmnsn_object* dmnsn() const;
+
+ protected:
+ // No-op
+ Object();
+ // Wrap an existing object.
+ explicit Object(dmnsn_object* object) : m_object(object) { }
+
+ dmnsn_object* m_object;
+
+ private:
+ // Copying prohibited
+ Object(const Object&);
+ Object& operator=(const Object&);
+ };
+
+ // A custom object abstract base class, for creating your own object types
+ class Custom_Object : public Object
+ {
+ public:
+ Custom_Object();
+ virtual ~Custom_Object();
+
+ virtual Array<double> intersections(const Line& l) = 0;
+ virtual bool inside(const Vector& point) = 0;
+ };
+}
+
+#endif /* DIMENSIONXX_OBJECT_HPP */
diff --git a/libdimensionxx/object.cpp b/libdimensionxx/object.cpp
new file mode 100644
index 0000000..33aeb85
--- /dev/null
+++ b/libdimensionxx/object.cpp
@@ -0,0 +1,92 @@
+/*************************************************************************
+ * 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
+ Object::~Object()
+ { }
+
+ // Intersection list for the line l
+ Array<double>
+ Object::intersections(const Line& l)
+ {
+ return Array<double>(m_object->intersections_fn(m_object, l.dmnsn()));
+ }
+
+ // Whether the point `point' is inside the object
+ bool
+ Object::inside(const Vector& point)
+ {
+ return m_object->inside_fn(m_object, point.dmnsn());
+ }
+
+ // Return the wrapped object
+ dmnsn_object*
+ Object::dmnsn()
+ {
+ return m_object;
+ }
+
+ // Return a const version of the wrapped canvas
+ const dmnsn_object*
+ Object::dmnsn() const
+ {
+ return m_object;
+ }
+
+ // Protected default no-op constructor
+ Object::Object()
+ { }
+
+ // Custom object callbacks
+ namespace {
+ dmnsn_array *
+ intersections_fn(const dmnsn_object *object, dmnsn_line line)
+ {
+ Custom_Object* cobject = reinterpret_cast<Custom_Object*>(object->ptr);
+ return cobject->intersections(Line(line)).release();
+ }
+
+ int
+ inside_fn(const dmnsn_object *object, dmnsn_vector point)
+ {
+ Custom_Object* cobject = reinterpret_cast<Custom_Object*>(object->ptr);
+ return cobject->inside(Vector(point));
+ }
+ }
+
+ // Initialize a new object, using member functions as callbacks
+ Custom_Object::Custom_Object()
+ : Object(dmnsn_new_object())
+ {
+ m_object->ptr = this;
+ m_object->intersections_fn = &intersections_fn;
+ m_object->inside_fn = &inside_fn;
+ }
+
+ // Delete the object
+ Custom_Object::~Custom_Object()
+ {
+ dmnsn_delete_object(m_object);
+ }
+}