Added mixed 2D and 3D object for difference tests

8 files changed, 13 insertions, 7 deletions

diff --git a/tests/regression/cgalpngtest/difference-2d-tests-expected.png b/tests/regression/cgalpngtest/difference-2d-tests-expected.png
index 51134f8..1476953 100644
--- a/tests/regression/cgalpngtest/difference-2d-tests-expected.png
+++ b/tests/regression/cgalpngtest/difference-2d-tests-expected.png
diff --git a/tests/regression/cgalpngtest/difference-tests-expected.png b/tests/regression/cgalpngtest/difference-tests-expected.png
index 1338bc1..bd27d89 100644
--- a/tests/regression/cgalpngtest/difference-tests-expected.png
+++ b/tests/regression/cgalpngtest/difference-tests-expected.png
diff --git a/tests/regression/dumptest/difference-2d-tests-expected.csg b/tests/regression/dumptest/difference-2d-tests-expected.csg
index 193b35b..7bc257d 100644
--- a/tests/regression/dumptest/difference-2d-tests-expected.csg
+++ b/tests/regression/dumptest/difference-2d-tests-expected.csg
@@ -27,4 +27,10 @@ group() {
 			circle($fn = 0, $fa = 12, $fs = 2, r = 4);
 		}
 	}
+	multmatrix([[1, 0, 0, 24], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			square(size = [10, 10], center = true);
+			sphere($fn = 0, $fa = 12, $fs = 2, r = 4);
+		}
+	}
 }
diff --git a/tests/regression/dumptest/difference-tests-expected.csg b/tests/regression/dumptest/difference-tests-expected.csg
index 472d4d4..8ff8a24 100644
--- a/tests/regression/dumptest/difference-tests-expected.csg
+++ b/tests/regression/dumptest/difference-tests-expected.csg
@@ -5,12 +5,6 @@ group() {
 		cube(size = [10, 10, 10], center = true);
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 	}
-	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		difference() {
-			cube(size = [10, 10, 10], center = true);
-			cylinder($fn = 0, $fa = 12, $fs = 2, h = 10.5, r1 = 4, r2 = 4, center = true);
-		}
-	}
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			cube(size = [10, 10, 10], center = true);
@@ -42,11 +36,17 @@ group() {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 		}
 	}
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+	multmatrix([[1, 0, 0, 24], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			group();
 			cube(size = [10, 10, 10], center = true);
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 4, r2 = 4, center = true);
 		}
 	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		difference() {
+			cube(size = [10, 10, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 6);
+		}
+	}
 }
diff --git a/tests/regression/opencsgtest/difference-2d-tests-expected.png b/tests/regression/opencsgtest/difference-2d-tests-expected.png
index b3b6710..ec45e77 100644
--- a/tests/regression/opencsgtest/difference-2d-tests-expected.png
+++ b/tests/regression/opencsgtest/difference-2d-tests-expected.png
diff --git a/tests/regression/opencsgtest/difference-tests-expected.png b/tests/regression/opencsgtest/difference-tests-expected.png
index 1cc87af..69a4ac2 100644
--- a/tests/regression/opencsgtest/difference-tests-expected.png
+++ b/tests/regression/opencsgtest/difference-tests-expected.png
diff --git a/tests/regression/throwntogethertest/difference-2d-tests-expected.png b/tests/regression/throwntogethertest/difference-2d-tests-expected.png
index 0c4ba44..4aae3be 100644
--- a/tests/regression/throwntogethertest/difference-2d-tests-expected.png
+++ b/tests/regression/throwntogethertest/difference-2d-tests-expected.png
diff --git a/tests/regression/throwntogethertest/difference-tests-expected.png b/tests/regression/throwntogethertest/difference-tests-expected.png
index c478c87..0227306 100644
--- a/tests/regression/throwntogethertest/difference-tests-expected.png
+++ b/tests/regression/throwntogethertest/difference-tests-expected.png