New C++ dmnsn_camera* wrapper.

4 files changed, 115 insertions, 11 deletions

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();
   };
 }