Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	doc/testing.txt
	tests/CMakeLists.txt
	tests/system-gl.cc
	tests/system-gl.h

71 files changed, 23 insertions, 9 deletions

diff --git a/tests/regression/cgalpngtest/example001-expected.png b/tests/regression/cgalpngtest/example001-expected.png
new file mode 100644
index 0000000..12b3dea
--- /dev/null
+++ b/tests/regression/cgalpngtest/example001-expected.png
diff --git a/tests/regression/cgalpngtest/example002-expected.png b/tests/regression/cgalpngtest/example002-expected.png
new file mode 100644
index 0000000..491477d
--- /dev/null
+++ b/tests/regression/cgalpngtest/example002-expected.png
diff --git a/tests/regression/cgalpngtest/example003-expected.png b/tests/regression/cgalpngtest/example003-expected.png
new file mode 100644
index 0000000..429b64b
--- /dev/null
+++ b/tests/regression/cgalpngtest/example003-expected.png
diff --git a/tests/regression/cgalpngtest/example004-expected.png b/tests/regression/cgalpngtest/example004-expected.png
new file mode 100644
index 0000000..b0a91fd
--- /dev/null
+++ b/tests/regression/cgalpngtest/example004-expected.png
diff --git a/tests/regression/cgalpngtest/example005-expected.png b/tests/regression/cgalpngtest/example005-expected.png
new file mode 100644
index 0000000..8727800
--- /dev/null
+++ b/tests/regression/cgalpngtest/example005-expected.png
diff --git a/tests/regression/cgalpngtest/example006-expected.png b/tests/regression/cgalpngtest/example006-expected.png
new file mode 100644
index 0000000..c2fd5c1
--- /dev/null
+++ b/tests/regression/cgalpngtest/example006-expected.png
diff --git a/tests/regression/cgalpngtest/example007-expected.png b/tests/regression/cgalpngtest/example007-expected.png
new file mode 100644
index 0000000..0ec829f
--- /dev/null
+++ b/tests/regression/cgalpngtest/example007-expected.png
diff --git a/tests/regression/cgalpngtest/example008-expected.png b/tests/regression/cgalpngtest/example008-expected.png
new file mode 100644
index 0000000..54cd35d
--- /dev/null
+++ b/tests/regression/cgalpngtest/example008-expected.png
diff --git a/tests/regression/cgalpngtest/example009-expected.png b/tests/regression/cgalpngtest/example009-expected.png
new file mode 100644
index 0000000..bbdc192
--- /dev/null
+++ b/tests/regression/cgalpngtest/example009-expected.png
diff --git a/tests/regression/cgalpngtest/example010-expected.png b/tests/regression/cgalpngtest/example010-expected.png
new file mode 100644
index 0000000..f611b12
--- /dev/null
+++ b/tests/regression/cgalpngtest/example010-expected.png
diff --git a/tests/regression/cgalpngtest/example011-expected.png b/tests/regression/cgalpngtest/example011-expected.png
new file mode 100644
index 0000000..88c8299
--- /dev/null
+++ b/tests/regression/cgalpngtest/example011-expected.png
diff --git a/tests/regression/cgalpngtest/example012-expected.png b/tests/regression/cgalpngtest/example012-expected.png
new file mode 100644
index 0000000..8065e9c
--- /dev/null
+++ b/tests/regression/cgalpngtest/example012-expected.png
diff --git a/tests/regression/cgalpngtest/example013-expected.png b/tests/regression/cgalpngtest/example013-expected.png
new file mode 100644
index 0000000..331fa17
--- /dev/null
+++ b/tests/regression/cgalpngtest/example013-expected.png
diff --git a/tests/regression/cgalpngtest/example014-expected.png b/tests/regression/cgalpngtest/example014-expected.png
new file mode 100644
index 0000000..73453a2
--- /dev/null
+++ b/tests/regression/cgalpngtest/example014-expected.png
diff --git a/tests/regression/cgalpngtest/example015-expected.png b/tests/regression/cgalpngtest/example015-expected.png
new file mode 100644
index 0000000..98d0e78
--- /dev/null
+++ b/tests/regression/cgalpngtest/example015-expected.png
diff --git a/tests/regression/cgalpngtest/example016-expected.png b/tests/regression/cgalpngtest/example016-expected.png
new file mode 100644
index 0000000..70bd10d
--- /dev/null
+++ b/tests/regression/cgalpngtest/example016-expected.png
diff --git a/tests/regression/cgalpngtest/example017-expected.png b/tests/regression/cgalpngtest/example017-expected.png
new file mode 100644
index 0000000..05f429b
--- /dev/null
+++ b/tests/regression/cgalpngtest/example017-expected.png
diff --git a/tests/regression/cgalpngtest/example018-expected.png b/tests/regression/cgalpngtest/example018-expected.png
new file mode 100644
index 0000000..5ea05af
--- /dev/null
+++ b/tests/regression/cgalpngtest/example018-expected.png
diff --git a/tests/regression/cgalpngtest/example019-expected.png b/tests/regression/cgalpngtest/example019-expected.png
new file mode 100644
index 0000000..42a356a
--- /dev/null
+++ b/tests/regression/cgalpngtest/example019-expected.png
diff --git a/tests/regression/cgalpngtest/example020-expected.png b/tests/regression/cgalpngtest/example020-expected.png
new file mode 100644
index 0000000..e6afb94
--- /dev/null
+++ b/tests/regression/cgalpngtest/example020-expected.png
diff --git a/tests/regression/cgalpngtest/example021-expected.png b/tests/regression/cgalpngtest/example021-expected.png
new file mode 100644
index 0000000..d657b0d
--- /dev/null
+++ b/tests/regression/cgalpngtest/example021-expected.png
diff --git a/tests/regression/cgalpngtest/example022-expected.png b/tests/regression/cgalpngtest/example022-expected.png
new file mode 100644
index 0000000..b8b8fbd
--- /dev/null
+++ b/tests/regression/cgalpngtest/example022-expected.png
diff --git a/tests/regression/dumptest/difference-tests-expected.txt b/tests/regression/dumptest/difference-tests-expected.txt
index bbdf3ea..eee4616 100644
--- a/tests/regression/dumptest/difference-tests-expected.txt
+++ b/tests/regression/dumptest/difference-tests-expected.txt
@@ -7,7 +7,7 @@
 	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 = 1, h = 10, r1 = 4, r2 = 4, center = true);
+			cylinder($fn = 0, $fa = 12, $fs = 1, 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]]) {
@@ -22,7 +22,7 @@
 	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		difference() {
 			cube(size = [10, 10, 10], center = true);
-			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7], [0, 0, 0, 1]]) {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 7.01], [0, 0, 0, 1]]) {
 				cylinder($fn = 0, $fa = 12, $fs = 1, h = 4, r1 = 4, r2 = 4, center = true);
 			}
 		}
diff --git a/tests/regression/dumptest/example009-expected.txt b/tests/regression/dumptest/example009-expected.txt
index 30c8bc3..df05fe2 100644
--- a/tests/regression/dumptest/example009-expected.txt
+++ b/tests/regression/dumptest/example009-expected.txt
@@ -1,14 +1,22 @@
-	linear_extrude(file = "example009.dxf", layer = "body", origin = [0, 0], scale = 1, height = 22, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1);
+	linear_extrude(height = 22, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) {
+		import(file = "example009.dxf", layer = "body", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	}
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 12], [0, 0, 0, 1]]) {
-			linear_extrude(file = "example009.dxf", layer = "plate", origin = [0, 0], scale = 1, height = 2, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1);
+			linear_extrude(height = 2, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) {
+				import(file = "example009.dxf", layer = "plate", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+			}
 		}
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -12], [0, 0, 0, 1]]) {
-			linear_extrude(file = "example009.dxf", layer = "plate", origin = [0, 0], scale = 1, height = 2, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1);
+			linear_extrude(height = 2, center = true, convexity = 10, $fn = 0, $fa = 12, $fs = 1) {
+				import(file = "example009.dxf", layer = "plate", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+			}
 		}
 	}
 	intersection() {
-		linear_extrude(file = "example009.dxf", layer = "fan_top", origin = [0, 0], scale = 1, height = 20, center = true, convexity = 10, twist = -57.5288, slices = 4, $fn = 0, $fa = 12, $fs = 1);
+		linear_extrude(height = 20, center = true, convexity = 10, twist = -57.5288, slices = 4, $fn = 0, $fa = 12, $fs = 1) {
+			import(file = "example009.dxf", layer = "fan_top", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+		}
 		rotate_extrude(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 10, $fn = 0, $fa = 12, $fs = 1);
 	}
 
diff --git a/tests/regression/dumptest/example013-expected.txt b/tests/regression/dumptest/example013-expected.txt
index b1dcccb..f4d0aec 100644
--- a/tests/regression/dumptest/example013-expected.txt
+++ b/tests/regression/dumptest/example013-expected.txt
@@ -1,10 +1,16 @@
 	intersection() {
-		linear_extrude(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1);
+		linear_extrude(height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1) {
+			import(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+		}
 		multmatrix([[2.22045e-16, 0, 1, 0], [0, 1, 0, 0], [-1, 0, 2.22045e-16, 0], [0, 0, 0, 1]]) {
-			linear_extrude(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1);
+			linear_extrude(height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1) {
+				import(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+			}
 		}
 		multmatrix([[1, 0, 0, 0], [0, 2.22045e-16, -1, 0], [0, 1, 2.22045e-16, 0], [0, 0, 0, 1]]) {
-			linear_extrude(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1);
+			linear_extrude(height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 1) {
+				import(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+			}
 		}
 	}
 
diff --git a/tests/regression/opencsgtest/difference-tests-expected.png b/tests/regression/opencsgtest/difference-tests-expected.png
index d88d98b..794104a 100644
--- a/tests/regression/opencsgtest/difference-tests-expected.png
+++ b/tests/regression/opencsgtest/difference-tests-expected.png
diff --git a/tests/regression/opencsgtest/example001-expected.png b/tests/regression/opencsgtest/example001-expected.png
new file mode 100644
index 0000000..ff2da6b
--- /dev/null
+++ b/tests/regression/opencsgtest/example001-expected.png
diff --git a/tests/regression/opencsgtest/example002-expected.png b/tests/regression/opencsgtest/example002-expected.png
new file mode 100644
index 0000000..554dc13
--- /dev/null
+++ b/tests/regression/opencsgtest/example002-expected.png
diff --git a/tests/regression/opencsgtest/example003-expected.png b/tests/regression/opencsgtest/example003-expected.png
new file mode 100644
index 0000000..1faa4a6
--- /dev/null
+++ b/tests/regression/opencsgtest/example003-expected.png
diff --git a/tests/regression/opencsgtest/example004-expected.png b/tests/regression/opencsgtest/example004-expected.png
new file mode 100644
index 0000000..beb549c
--- /dev/null
+++ b/tests/regression/opencsgtest/example004-expected.png
diff --git a/tests/regression/opencsgtest/example005-expected.png b/tests/regression/opencsgtest/example005-expected.png
new file mode 100644
index 0000000..0bb2fef
--- /dev/null
+++ b/tests/regression/opencsgtest/example005-expected.png
diff --git a/tests/regression/opencsgtest/example006-expected.png b/tests/regression/opencsgtest/example006-expected.png
new file mode 100644
index 0000000..ff0fe35
--- /dev/null
+++ b/tests/regression/opencsgtest/example006-expected.png
diff --git a/tests/regression/opencsgtest/example007-expected.png b/tests/regression/opencsgtest/example007-expected.png
new file mode 100644
index 0000000..b212b12
--- /dev/null
+++ b/tests/regression/opencsgtest/example007-expected.png
diff --git a/tests/regression/opencsgtest/example008-expected.png b/tests/regression/opencsgtest/example008-expected.png
new file mode 100644
index 0000000..0e4241f
--- /dev/null
+++ b/tests/regression/opencsgtest/example008-expected.png
diff --git a/tests/regression/opencsgtest/example009-expected.png b/tests/regression/opencsgtest/example009-expected.png
new file mode 100644
index 0000000..541410d
--- /dev/null
+++ b/tests/regression/opencsgtest/example009-expected.png
diff --git a/tests/regression/opencsgtest/example010-expected.png b/tests/regression/opencsgtest/example010-expected.png
new file mode 100644
index 0000000..3a4ba27
--- /dev/null
+++ b/tests/regression/opencsgtest/example010-expected.png
diff --git a/tests/regression/opencsgtest/example011-expected.png b/tests/regression/opencsgtest/example011-expected.png
new file mode 100644
index 0000000..13164c3
--- /dev/null
+++ b/tests/regression/opencsgtest/example011-expected.png
diff --git a/tests/regression/opencsgtest/example012-expected.png b/tests/regression/opencsgtest/example012-expected.png
new file mode 100644
index 0000000..c705bc7
--- /dev/null
+++ b/tests/regression/opencsgtest/example012-expected.png
diff --git a/tests/regression/opencsgtest/example013-expected.png b/tests/regression/opencsgtest/example013-expected.png
new file mode 100644
index 0000000..5917382
--- /dev/null
+++ b/tests/regression/opencsgtest/example013-expected.png
diff --git a/tests/regression/opencsgtest/example014-expected.png b/tests/regression/opencsgtest/example014-expected.png
new file mode 100644
index 0000000..7f39f61
--- /dev/null
+++ b/tests/regression/opencsgtest/example014-expected.png
diff --git a/tests/regression/opencsgtest/example015-expected.png b/tests/regression/opencsgtest/example015-expected.png
new file mode 100644
index 0000000..1a1c869
--- /dev/null
+++ b/tests/regression/opencsgtest/example015-expected.png
diff --git a/tests/regression/opencsgtest/example016-expected.png b/tests/regression/opencsgtest/example016-expected.png
new file mode 100644
index 0000000..1288ff6
--- /dev/null
+++ b/tests/regression/opencsgtest/example016-expected.png
diff --git a/tests/regression/opencsgtest/example017-expected.png b/tests/regression/opencsgtest/example017-expected.png
new file mode 100644
index 0000000..b0b2f8a
--- /dev/null
+++ b/tests/regression/opencsgtest/example017-expected.png
diff --git a/tests/regression/opencsgtest/example018-expected.png b/tests/regression/opencsgtest/example018-expected.png
new file mode 100644
index 0000000..033a136
--- /dev/null
+++ b/tests/regression/opencsgtest/example018-expected.png
diff --git a/tests/regression/opencsgtest/example019-expected.png b/tests/regression/opencsgtest/example019-expected.png
new file mode 100644
index 0000000..306c0fb
--- /dev/null
+++ b/tests/regression/opencsgtest/example019-expected.png
diff --git a/tests/regression/opencsgtest/example020-expected.png b/tests/regression/opencsgtest/example020-expected.png
new file mode 100644
index 0000000..4e8c3c4
--- /dev/null
+++ b/tests/regression/opencsgtest/example020-expected.png
diff --git a/tests/regression/opencsgtest/example021-expected.png b/tests/regression/opencsgtest/example021-expected.png
new file mode 100644
index 0000000..675e57b
--- /dev/null
+++ b/tests/regression/opencsgtest/example021-expected.png
diff --git a/tests/regression/opencsgtest/example022-expected.png b/tests/regression/opencsgtest/example022-expected.png
new file mode 100644
index 0000000..66738e0
--- /dev/null
+++ b/tests/regression/opencsgtest/example022-expected.png
diff --git a/tests/regression/throwntogethertest/difference-tests-expected.png b/tests/regression/throwntogethertest/difference-tests-expected.png
index 0b8070f..ee75bad 100644
--- a/tests/regression/throwntogethertest/difference-tests-expected.png
+++ b/tests/regression/throwntogethertest/difference-tests-expected.png
diff --git a/tests/regression/throwntogethertest/example001-expected.png b/tests/regression/throwntogethertest/example001-expected.png
new file mode 100644
index 0000000..a0ea588
--- /dev/null
+++ b/tests/regression/throwntogethertest/example001-expected.png
diff --git a/tests/regression/throwntogethertest/example002-expected.png b/tests/regression/throwntogethertest/example002-expected.png
new file mode 100644
index 0000000..27e3c4e
--- /dev/null
+++ b/tests/regression/throwntogethertest/example002-expected.png
diff --git a/tests/regression/throwntogethertest/example003-expected.png b/tests/regression/throwntogethertest/example003-expected.png
new file mode 100644
index 0000000..f27d17c
--- /dev/null
+++ b/tests/regression/throwntogethertest/example003-expected.png
diff --git a/tests/regression/throwntogethertest/example004-expected.png b/tests/regression/throwntogethertest/example004-expected.png
new file mode 100644
index 0000000..0d2f1ba
--- /dev/null
+++ b/tests/regression/throwntogethertest/example004-expected.png
diff --git a/tests/regression/throwntogethertest/example005-expected.png b/tests/regression/throwntogethertest/example005-expected.png
new file mode 100644
index 0000000..4c401da
--- /dev/null
+++ b/tests/regression/throwntogethertest/example005-expected.png
diff --git a/tests/regression/throwntogethertest/example006-expected.png b/tests/regression/throwntogethertest/example006-expected.png
new file mode 100644
index 0000000..66441bf
--- /dev/null
+++ b/tests/regression/throwntogethertest/example006-expected.png
diff --git a/tests/regression/throwntogethertest/example007-expected.png b/tests/regression/throwntogethertest/example007-expected.png
new file mode 100644
index 0000000..ea17570
--- /dev/null
+++ b/tests/regression/throwntogethertest/example007-expected.png
diff --git a/tests/regression/throwntogethertest/example008-expected.png b/tests/regression/throwntogethertest/example008-expected.png
new file mode 100644
index 0000000..880844b
--- /dev/null
+++ b/tests/regression/throwntogethertest/example008-expected.png
diff --git a/tests/regression/throwntogethertest/example009-expected.png b/tests/regression/throwntogethertest/example009-expected.png
new file mode 100644
index 0000000..de8868a
--- /dev/null
+++ b/tests/regression/throwntogethertest/example009-expected.png
diff --git a/tests/regression/throwntogethertest/example010-expected.png b/tests/regression/throwntogethertest/example010-expected.png
new file mode 100644
index 0000000..37e6545
--- /dev/null
+++ b/tests/regression/throwntogethertest/example010-expected.png
diff --git a/tests/regression/throwntogethertest/example011-expected.png b/tests/regression/throwntogethertest/example011-expected.png
new file mode 100644
index 0000000..13164c3
--- /dev/null
+++ b/tests/regression/throwntogethertest/example011-expected.png
diff --git a/tests/regression/throwntogethertest/example012-expected.png b/tests/regression/throwntogethertest/example012-expected.png
new file mode 100644
index 0000000..360d6eb
--- /dev/null
+++ b/tests/regression/throwntogethertest/example012-expected.png
diff --git a/tests/regression/throwntogethertest/example013-expected.png b/tests/regression/throwntogethertest/example013-expected.png
new file mode 100644
index 0000000..d22b68f
--- /dev/null
+++ b/tests/regression/throwntogethertest/example013-expected.png
diff --git a/tests/regression/throwntogethertest/example014-expected.png b/tests/regression/throwntogethertest/example014-expected.png
new file mode 100644
index 0000000..562ce74
--- /dev/null
+++ b/tests/regression/throwntogethertest/example014-expected.png
diff --git a/tests/regression/throwntogethertest/example015-expected.png b/tests/regression/throwntogethertest/example015-expected.png
new file mode 100644
index 0000000..6e16e33
--- /dev/null
+++ b/tests/regression/throwntogethertest/example015-expected.png
diff --git a/tests/regression/throwntogethertest/example016-expected.png b/tests/regression/throwntogethertest/example016-expected.png
new file mode 100644
index 0000000..9bc4306
--- /dev/null
+++ b/tests/regression/throwntogethertest/example016-expected.png
diff --git a/tests/regression/throwntogethertest/example017-expected.png b/tests/regression/throwntogethertest/example017-expected.png
new file mode 100644
index 0000000..b0b2f8a
--- /dev/null
+++ b/tests/regression/throwntogethertest/example017-expected.png
diff --git a/tests/regression/throwntogethertest/example018-expected.png b/tests/regression/throwntogethertest/example018-expected.png
new file mode 100644
index 0000000..033a136
--- /dev/null
+++ b/tests/regression/throwntogethertest/example018-expected.png
diff --git a/tests/regression/throwntogethertest/example019-expected.png b/tests/regression/throwntogethertest/example019-expected.png
new file mode 100644
index 0000000..306c0fb
--- /dev/null
+++ b/tests/regression/throwntogethertest/example019-expected.png
diff --git a/tests/regression/throwntogethertest/example020-expected.png b/tests/regression/throwntogethertest/example020-expected.png
new file mode 100644
index 0000000..fa41d2f
--- /dev/null
+++ b/tests/regression/throwntogethertest/example020-expected.png
diff --git a/tests/regression/throwntogethertest/example021-expected.png b/tests/regression/throwntogethertest/example021-expected.png
new file mode 100644
index 0000000..1e1576c
--- /dev/null
+++ b/tests/regression/throwntogethertest/example021-expected.png
diff --git a/tests/regression/throwntogethertest/example022-expected.png b/tests/regression/throwntogethertest/example022-expected.png
new file mode 100644
index 0000000..66738e0
--- /dev/null
+++ b/tests/regression/throwntogethertest/example022-expected.png