Added minkowski and 2d-3d tests

11 files changed, 67 insertions, 67 deletions

diff --git a/testdata/scad/features/2d-3d.scad b/testdata/scad/features/2d-3d.scad
new file mode 100644
index 0000000..ca9f966
--- /dev/null
+++ b/testdata/scad/features/2d-3d.scad
@@ -0,0 +1,3 @@
+// Test a mix of toplevel 2D and 3D objects
+cube();
+translate([2,0,0]) square();
diff --git a/testdata/scad/features/minkowski-tests.scad b/testdata/scad/features/minkowski-tests.scad
deleted file mode 100644
index 6d0dade..0000000
--- a/testdata/scad/features/minkowski-tests.scad
+++ /dev/null
@@ -1,67 +0,0 @@
-
-// Rounded box using 3d minkowski
-module roundedBox3dSimple() {
-    minkowski() {
-        cube([10,10,5]);
-        cylinder(r=5, h=5);
-    }
-}
-
-// Currently segfaults
-module roundedBox3dCut() {
-    minkowski() {
-        difference() {
-            cube([10,10,5]);
-            cube([5,5,5]);
-        }
-        cylinder(r=5, h=5);
-    }
-}
-
-// Currently segfaults
-module roundedBox3dHole() {
-    minkowski() {
-        difference() {
-            cube([10,10,5]);
-            translate([2,2,-2]) cube([6,6,10]);
-        }
-        cylinder(r=2);
-    }
-}
-
-// Works correctly
-module roundedBox2dSimple() {
-    minkowski() {
-        square([10,10]);
-        circle(r=5);
-    }
-}
-
-// Works correctly
-module roundedBox2dCut() {
-    minkowski() {
-        difference() {
-            square([10,10]);
-            square([5,5]);
-        }
-        circle(r=5);
-    }
-}
-
-// Not quite correct, result does not contain a hole, since the impl currently returns the outer boundary of the polygon_with_holes.
-module roundedBox2dHole() {
-    minkowski() {
-        difference() {
-            square([10,10]);
-            translate([2,2]) square([6,6]);
-        }
-        circle(r=2);
-    }
-}
-
-translate([-25,0,0]) roundedBox2dHole();
-translate([0,0,0]) roundedBox2dCut();
-translate([25,0,0]) roundedBox2dSimple();
-translate([-25,25,0]) roundedBox3dHole();
-translate([0,25,0]) roundedBox3dCut();
-translate([25,25,0]) roundedBox3dSimple();
diff --git a/testdata/scad/features/minkowski2-tests.scad b/testdata/scad/features/minkowski2-tests.scad
new file mode 100644
index 0000000..08f3d98
--- /dev/null
+++ b/testdata/scad/features/minkowski2-tests.scad
@@ -0,0 +1,31 @@
+module roundedBox2dSimple() {
+    minkowski() {
+        square([10,10]);
+        circle(r=5);
+    }
+}
+
+module roundedBox2dCut() {
+    minkowski() {
+        difference() {
+            square([10,10]);
+            square([5,5]);
+        }
+        circle(r=5);
+    }
+}
+
+// Not quite correct, result does not contain a hole, since the impl currently returns the outer boundary of the polygon_with_holes.
+module roundedBox2dHole() {
+    minkowski() {
+        difference() {
+            square([10,10], center=true);
+            square([8,8], center=true);
+        }
+        circle(r=2);
+    }
+}
+
+translate([-20,5,0]) roundedBox2dHole();
+translate([0,0,0]) roundedBox2dCut();
+translate([25,0,0]) roundedBox2dSimple();
diff --git a/testdata/scad/features/minkowski3-tests.scad b/testdata/scad/features/minkowski3-tests.scad
new file mode 100644
index 0000000..0e53563
--- /dev/null
+++ b/testdata/scad/features/minkowski3-tests.scad
@@ -0,0 +1,30 @@
+module roundedBox3dSimple() {
+    minkowski() {
+        cube([10,10,5]);
+        cylinder(r=5, h=5);
+    }
+}
+
+module roundedBox3dCut() {
+    minkowski() {
+        difference() {
+            cube([10,10,5]);
+            cube([5,5,5]);
+        }
+        cylinder(r=5, h=5);
+    }
+}
+
+module roundedBox3dHole() {
+    minkowski() {
+        difference() {
+            cube([10,10,5], center=true);
+            cube([8,8,10], center=true);
+        }
+        cylinder(r=2);
+    }
+}
+
+translate([-20,30,0]) roundedBox3dHole();
+translate([0,25,0]) roundedBox3dCut();
+translate([25,25,0]) roundedBox3dSimple();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a869cdf..6c8e24b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -205,6 +205,7 @@ add_cmdline_test(cgaltest stl ${CGALTEST_FILES})
 
 # Add cgalpngtest tests to CTest
 LIST(APPEND CGALPNGTEST_FILES 
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/features/2d-3d.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/circle-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/square-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/polygon-tests.scad
@@ -216,6 +217,8 @@ LIST(APPEND CGALPNGTEST_FILES
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/intersection-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/linear_extrude-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/rotate_extrude-tests.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/features/minkowski2-tests.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/features/minkowski3-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/surface-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/import_dxf-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/features/transform-tests.scad
diff --git a/tests/regression/cgalpngtest/2d-3d-expected.png b/tests/regression/cgalpngtest/2d-3d-expected.png
new file mode 100644
index 0000000..4d202ac
--- /dev/null
+++ b/tests/regression/cgalpngtest/2d-3d-expected.png
diff --git a/tests/regression/cgalpngtest/minkowski2-tests-expected.png b/tests/regression/cgalpngtest/minkowski2-tests-expected.png
new file mode 100644
index 0000000..ebdbc74
--- /dev/null
+++ b/tests/regression/cgalpngtest/minkowski2-tests-expected.png
diff --git a/tests/regression/cgalpngtest/minkowski3-tests-expected.png b/tests/regression/cgalpngtest/minkowski3-tests-expected.png
new file mode 100644
index 0000000..6d74961
--- /dev/null
+++ b/tests/regression/cgalpngtest/minkowski3-tests-expected.png
diff --git a/tests/regression/opencsgtest/2d-3d-expected.png b/tests/regression/opencsgtest/2d-3d-expected.png
new file mode 100644
index 0000000..47418f0
--- /dev/null
+++ b/tests/regression/opencsgtest/2d-3d-expected.png
diff --git a/tests/regression/opencsgtest/minkowski2-tests-expected.png b/tests/regression/opencsgtest/minkowski2-tests-expected.png
new file mode 100644
index 0000000..062f1ed
--- /dev/null
+++ b/tests/regression/opencsgtest/minkowski2-tests-expected.png
diff --git a/tests/regression/opencsgtest/minkowski3-tests-expected.png b/tests/regression/opencsgtest/minkowski3-tests-expected.png
new file mode 100644
index 0000000..1f0d572
--- /dev/null
+++ b/tests/regression/opencsgtest/minkowski3-tests-expected.png