New C++ dmnsn_scene* wrapper and raytracexx test.

3 files changed, 103 insertions, 26 deletions

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;
+}