Merge remote branch 'upstream/master'

1 files changed, 54 insertions, 4 deletions

diff --git a/tests/regression/dumptest/intersection-tests-expected.txt b/tests/regression/dumptest/intersection-tests-expected.txt
index 90349a3..5613abf 100644
--- a/tests/regression/dumptest/intersection-tests-expected.txt
+++ b/tests/regression/dumptest/intersection-tests-expected.txt
@@ -1,6 +1,56 @@
-group() {
+	intersection();
+	intersection();
 	intersection() {
-		sphere($fn = 0, $fa = 12, $fs = 1, r = 3);
-		cube(size = [3, 3, 8], center = true);
+		sphere($fn = 0, $fa = 12, $fs = 1, r = 5);
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 3], [0, 0, 0, 1]]) {
+			cube(size = [4, 4, 6], center = true);
+		}
 	}
-}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 1, h = 12, r1 = 4, r2 = 4, center = true);
+		}
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 1, h = 12, r1 = 4, r2 = 4, center = true);
+			multmatrix([[2.22045e-16, 0, 1, 0], [0, 1, 0, 0], [-1, 0, 2.22045e-16, 0], [0, 0, 0, 1]]) {
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 12, r1 = 4, r2 = 4, center = true);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7], [0, 0, 0, 1]]) {
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 4, r1 = 4, r2 = 4, center = true);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 24], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 6.99], [0, 0, 0, 1]]) {
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 4, r1 = 4, r2 = 4, center = true);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, -12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
+				cube(size = [10, 10, 10], center = true);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, -12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		intersection() {
+			cube(size = [10, 10, 10], center = true);
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, -9.99], [0, 0, 1, -9.99], [0, 0, 0, 1]]) {
+				cube(size = [10, 10, 10], center = true);
+			}
+		}
+	}
+