merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 39 insertions, 2 deletions

diff --git a/testdata/scad/features/intersection-tests.scad b/testdata/scad/features/intersection-tests.scad
index 4101b03..e53f3c9 100644
--- a/testdata/scad/features/intersection-tests.scad
+++ b/testdata/scad/features/intersection-tests.scad
@@ -1,4 +1,41 @@
+// Empty
+intersection();
+
+// No children
+intersection() { }
+
 intersection() {
-  sphere(3);
-  cube([3,3,8], center=true);
+  sphere(r=5);
+  translate([0,0,3]) cube([4,4,6], center=true);
+}
+
+translate([0,12,0]) intersection() {
+  cube([10,10,10], center=true);
+  cylinder(r=4, h=12, center=true);
+}
+
+translate([12,0,0]) intersection() {
+  cube([10,10,10], center=true);
+  cylinder(r=4, h=12, center=true);
+  rotate([0,90,0]) cylinder(r=4, h=12, center=true);
+}
+
+translate([12,12,0]) intersection() {
+  cube([10,10,10], center=true);
+  translate([0,0,7]) cylinder(r=4, h=4, center=true);
+}
+
+translate([24,0,0]) intersection() {
+  cube([10,10,10], center=true);
+  translate([0,0,6.99]) cylinder(r=4, h=4, center=true);
+}
+
+translate([-12,0,0]) intersection() {
+  cube([10,10,10], center=true);
+  translate([0,-10,-10]) cube([10,10,10], center=true);
+}
+
+translate([-12,12,0]) intersection() {
+  cube([10,10,10], center=true);
+  translate([0,-9.99,-9.99]) cube([10,10,10], center=true);
 }