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

41 files changed, 41 insertions, 0 deletions

diff --git a/tests/regression/csgtermtest/allfunctions-expected.txt b/tests/regression/csgtermtest/allfunctions-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/allfunctions-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/allmodules-expected.txt b/tests/regression/csgtermtest/allmodules-expected.txt
new file mode 100644
index 0000000..f544c01
--- /dev/null
+++ b/tests/regression/csgtermtest/allmodules-expected.txt
@@ -0,0 +1 @@
+((((((cube23 + sphere24) + cylinder25) + polyhedron26) + square27) + circle28) + polygon29)
diff --git a/tests/regression/csgtermtest/assign-expected.txt b/tests/regression/csgtermtest/assign-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/assign-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/child-expected.txt b/tests/regression/csgtermtest/child-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/child-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/circle-expected.txt b/tests/regression/csgtermtest/circle-expected.txt
new file mode 100644
index 0000000..b8c8161
--- /dev/null
+++ b/tests/regression/csgtermtest/circle-expected.txt
@@ -0,0 +1 @@
+circle2
diff --git a/tests/regression/csgtermtest/color-expected.txt b/tests/regression/csgtermtest/color-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/color-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/cube-expected.txt b/tests/regression/csgtermtest/cube-expected.txt
new file mode 100644
index 0000000..3393bc4
--- /dev/null
+++ b/tests/regression/csgtermtest/cube-expected.txt
@@ -0,0 +1 @@
+cube2
diff --git a/tests/regression/csgtermtest/cylinder-expected.txt b/tests/regression/csgtermtest/cylinder-expected.txt
new file mode 100644
index 0000000..f3dd1f9
--- /dev/null
+++ b/tests/regression/csgtermtest/cylinder-expected.txt
@@ -0,0 +1 @@
+cylinder2
diff --git a/tests/regression/csgtermtest/difference-expected.txt b/tests/regression/csgtermtest/difference-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/difference-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt b/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/dxf_linear_extrude-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/dxf_rotate_extrude-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/echo-expected.txt b/tests/regression/csgtermtest/echo-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/echo-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/for-expected.txt b/tests/regression/csgtermtest/for-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/for-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/glide-expected.txt b/tests/regression/csgtermtest/glide-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/glide-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/group-expected.txt b/tests/regression/csgtermtest/group-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/group-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/hull-expected.txt b/tests/regression/csgtermtest/hull-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/hull-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/if-expected.txt b/tests/regression/csgtermtest/if-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/if-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/import-expected.txt b/tests/regression/csgtermtest/import-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/import-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_dxf-expected.txt b/tests/regression/csgtermtest/import_dxf-expected.txt
new file mode 100644
index 0000000..847d6c3
--- /dev/null
+++ b/tests/regression/csgtermtest/import_dxf-expected.txt
@@ -0,0 +1 @@
+import2
diff --git a/tests/regression/csgtermtest/import_off-expected.txt b/tests/regression/csgtermtest/import_off-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/import_off-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/import_stl-expected.txt b/tests/regression/csgtermtest/import_stl-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/import_stl-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection-expected.txt b/tests/regression/csgtermtest/intersection-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/intersection-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/intersection_for-expected.txt b/tests/regression/csgtermtest/intersection_for-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/intersection_for-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/linear_extrude-expected.txt b/tests/regression/csgtermtest/linear_extrude-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/linear_extrude-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/minkowski-expected.txt b/tests/regression/csgtermtest/minkowski-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/minkowski-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/mirror-expected.txt b/tests/regression/csgtermtest/mirror-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/mirror-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/multmatrix-expected.txt b/tests/regression/csgtermtest/multmatrix-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/multmatrix-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/polygon-expected.txt b/tests/regression/csgtermtest/polygon-expected.txt
new file mode 100644
index 0000000..b41dfc6
--- /dev/null
+++ b/tests/regression/csgtermtest/polygon-expected.txt
@@ -0,0 +1 @@
+polygon2
diff --git a/tests/regression/csgtermtest/polyhedron-expected.txt b/tests/regression/csgtermtest/polyhedron-expected.txt
new file mode 100644
index 0000000..5ccc055
--- /dev/null
+++ b/tests/regression/csgtermtest/polyhedron-expected.txt
@@ -0,0 +1 @@
+polyhedron2
diff --git a/tests/regression/csgtermtest/projection-expected.txt b/tests/regression/csgtermtest/projection-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/projection-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/render-expected.txt b/tests/regression/csgtermtest/render-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/render-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate-expected.txt b/tests/regression/csgtermtest/rotate-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/rotate-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/rotate_extrude-expected.txt b/tests/regression/csgtermtest/rotate_extrude-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/rotate_extrude-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/scale-expected.txt b/tests/regression/csgtermtest/scale-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/scale-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/sphere-expected.txt b/tests/regression/csgtermtest/sphere-expected.txt
new file mode 100644
index 0000000..f9b8d73
--- /dev/null
+++ b/tests/regression/csgtermtest/sphere-expected.txt
@@ -0,0 +1 @@
+sphere2
diff --git a/tests/regression/csgtermtest/square-expected.txt b/tests/regression/csgtermtest/square-expected.txt
new file mode 100644
index 0000000..8190c0f
--- /dev/null
+++ b/tests/regression/csgtermtest/square-expected.txt
@@ -0,0 +1 @@
+square2
diff --git a/tests/regression/csgtermtest/subdiv-expected.txt b/tests/regression/csgtermtest/subdiv-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/subdiv-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/surface-expected.txt b/tests/regression/csgtermtest/surface-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/surface-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/transform-insert-expected.txt b/tests/regression/csgtermtest/transform-insert-expected.txt
new file mode 100644
index 0000000..847d6c3
--- /dev/null
+++ b/tests/regression/csgtermtest/transform-insert-expected.txt
@@ -0,0 +1 @@
+import2
diff --git a/tests/regression/csgtermtest/translate-expected.txt b/tests/regression/csgtermtest/translate-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/translate-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object
diff --git a/tests/regression/csgtermtest/union-expected.txt b/tests/regression/csgtermtest/union-expected.txt
new file mode 100644
index 0000000..a40cf60
--- /dev/null
+++ b/tests/regression/csgtermtest/union-expected.txt
@@ -0,0 +1 @@
+No top-level CSG object