Merge remote branch 'upstream/master' into cakebaby

6 files changed, 23 insertions, 29 deletions

diff --git a/tests/regression/cgalpngtest/hull3-tests-expected.png b/tests/regression/cgalpngtest/hull3-tests-expected.png
index 50d838c..e34ae89 100644
--- a/tests/regression/cgalpngtest/hull3-tests-expected.png
+++ b/tests/regression/cgalpngtest/hull3-tests-expected.png
diff --git a/tests/regression/dumptest/escape-test-expected.txt b/tests/regression/dumptest/escape-test-expected.txt
index 1b2aa0d..bea0156 100644
--- a/tests/regression/dumptest/escape-test-expected.txt
+++ b/tests/regression/dumptest/escape-test-expected.txt
@@ -1,2 +1,2 @@
-	import(file = "A:\\ B:\" C:\t D:\n E:' F:\\\\", layer = "A:\\ B:\" C:\t D:\n E:' F:\\\\", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
+	import(file = "A-\\ B-\" C-\t D-\n E-' F-\\\\", layer = "A:\\ B:\" C:\t D:\n E:' F:\\\\", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 
diff --git a/tests/regression/dumptest/hull3-tests-expected.txt b/tests/regression/dumptest/hull3-tests-expected.txt
index 831aae2..bde58c9 100644
--- a/tests/regression/dumptest/hull3-tests-expected.txt
+++ b/tests/regression/dumptest/hull3-tests-expected.txt
@@ -1,26 +1,20 @@
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		group() {
-			hull() {
-				multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-					cylinder($fn = 0, $fa = 12, $fs = 1, h = 10, r1 = 1, r2 = 1, center = false);
-				}
-				difference() {
-					cylinder($fn = 0, $fa = 12, $fs = 1, h = 10, r1 = 1, r2 = 1, center = false);
-					cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 1, r2 = 1, center = false);
-				}
-			}
+	hull();
+	hull();
+	hull() {
+		cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false);
+		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 10], [0, 0, 0, 1]]) {
+			cube(size = [5, 5, 5], center = true);
 		}
 	}
-	multmatrix([[1, 0, 0, 40], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		group() {
-			hull() {
-				multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-					cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false);
-				}
-				cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 10, r2 = 10, center = false);
+	multmatrix([[1, 0, 0, 25], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		hull() {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 10], [0, 0, 0, 1]]) {
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 1, r1 = 3, r2 = 3, center = false);
+			}
+			difference() {
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 4, r1 = 10, r2 = 10, center = true);
+				cylinder($fn = 0, $fa = 12, $fs = 1, h = 5, r1 = 5, r2 = 5, center = true);
 			}
 		}
 	}
-	hull();
-	hull();
 
diff --git a/tests/regression/echotest/dim-all-expected.txt b/tests/regression/echotest/dim-all-expected.txt
index 702f026..74044a1 100644
--- a/tests/regression/echotest/dim-all-expected.txt
+++ b/tests/regression/echotest/dim-all-expected.txt
@@ -1,16 +1,16 @@
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: linearX = 51.44957554275265
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: linearY = 29.13025467434841
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: aligned = 60.00000000000001
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: ordinateX = -49.17542445724735
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: ordinateY = 30.86974532565159
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: radius = 60
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: diameter = 120
-WARNING: Unsupported DXF Entity `LEADER' (1) in `/Users/kintel/code/OpenSCAD/openscad/testdata/scad/misc/dim-all.dxf'.
+WARNING: Unsupported DXF Entity `LEADER' (1) in `dim-all.dxf'.
 ECHO: arc = 59.03624346792648
diff --git a/tests/regression/opencsgtest/hull3-tests-expected.png b/tests/regression/opencsgtest/hull3-tests-expected.png
index 50d838c..5a363a1 100644
--- a/tests/regression/opencsgtest/hull3-tests-expected.png
+++ b/tests/regression/opencsgtest/hull3-tests-expected.png
diff --git a/tests/regression/throwntogethertest/hull3-tests-expected.png b/tests/regression/throwntogethertest/hull3-tests-expected.png
index 50d838c..5a363a1 100644
--- a/tests/regression/throwntogethertest/hull3-tests-expected.png
+++ b/tests/regression/throwntogethertest/hull3-tests-expected.png