Merge branch 'master' into issue410x

16 files changed, 57 insertions, 25 deletions

diff --git a/tests/regression/cgalpngtest/polygon-tests-expected.png b/tests/regression/cgalpngtest/polygon-tests-expected.png
index 5ceabe8..28e4e9f 100644
--- a/tests/regression/cgalpngtest/polygon-tests-expected.png
+++ b/tests/regression/cgalpngtest/polygon-tests-expected.png
diff --git a/tests/regression/cgalpngtest/projection-cut-tests-expected.png b/tests/regression/cgalpngtest/projection-cut-tests-expected.png
new file mode 100644
index 0000000..7189447
--- /dev/null
+++ b/tests/regression/cgalpngtest/projection-cut-tests-expected.png
diff --git a/tests/regression/cgalpngtest/projection-tests-expected.png b/tests/regression/cgalpngtest/projection-tests-expected.png
index 3be3654..c0d5289 100644
--- a/tests/regression/cgalpngtest/projection-tests-expected.png
+++ b/tests/regression/cgalpngtest/projection-tests-expected.png
diff --git a/tests/regression/cgalpngtest/render-2d-tests-expected.png b/tests/regression/cgalpngtest/render-2d-tests-expected.png
index 19ea16a..2418968 100644
--- a/tests/regression/cgalpngtest/render-2d-tests-expected.png
+++ b/tests/regression/cgalpngtest/render-2d-tests-expected.png
diff --git a/tests/regression/dumptest/polygon-tests-expected.csg b/tests/regression/dumptest/polygon-tests-expected.csg
index 56995a5..e19bcb0 100644
--- a/tests/regression/dumptest/polygon-tests-expected.csg
+++ b/tests/regression/dumptest/polygon-tests-expected.csg
@@ -33,4 +33,7 @@ group() {
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		polygon(points = [[0, 0], [1, 0], [1, 1], [0, 0]], paths = undef, convexity = 1);
 	}
+	multmatrix([[1, 0, 0, -2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		polygon(points = [[0, 0], [1, 0], [1, 1], [0, 1], [0.2, 0.2], [0.8, 0.2], [0.8, 0.8], [0.2, 0.8]], paths = [[0, 1, 2, 3], [4, 5, 6, 7]], convexity = 1);
+	}
 }
diff --git a/tests/regression/dumptest/projection-cut-tests-expected.csg b/tests/regression/dumptest/projection-cut-tests-expected.csg
new file mode 100644
index 0000000..4c37fa2
--- /dev/null
+++ b/tests/regression/dumptest/projection-cut-tests-expected.csg
@@ -0,0 +1,33 @@
+group() {
+	projection(cut = true, convexity = 0) {
+		square(size = [1, 1], center = false);
+	}
+	projection(cut = true, convexity = 0) {
+		multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+			cube(size = [10, 10, 10], center = true);
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		projection(cut = true, convexity = 0) {
+			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -4.999999], [0, 0, 0, 1]]) {
+				cube(size = [10, 10, 10], center = true);
+			}
+		}
+	}
+	multmatrix([[1, 0, 0, 0], [0, 1, 0, -10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		projection(cut = true, convexity = 0) {
+			union() {
+				difference() {
+					cube(size = [5, 5, 5], center = true);
+					cube(size = [4, 4, 4], center = true);
+				}
+				multmatrix([[1, 0, 0, 2.1], [0, 1, 0, 2.1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+					difference() {
+						cube(size = [5, 5, 5], center = true);
+						cube(size = [4, 4, 4], center = true);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/tests/regression/dumptest/projection-tests-expected.csg b/tests/regression/dumptest/projection-tests-expected.csg
index da3e5ce..04cd404 100644
--- a/tests/regression/dumptest/projection-tests-expected.csg
+++ b/tests/regression/dumptest/projection-tests-expected.csg
@@ -1,37 +1,27 @@
 group() {
 	projection(cut = false, convexity = 0);
 	projection(cut = false, convexity = 0);
-	projection(cut = true, convexity = 0) {
+	projection(cut = false, convexity = 0) {
 		square(size = [1, 1], center = false);
 	}
 	projection(cut = false, convexity = 0) {
 		cube(size = [10, 10, 10], center = false);
 	}
-	projection(cut = true, convexity = 0) {
-		multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-			cube(size = [10, 10, 10], center = true);
-		}
-	}
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		projection(cut = true, convexity = 0) {
-			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -4.999999], [0, 0, 0, 1]]) {
-				cube(size = [10, 10, 10], center = true);
+	multmatrix([[1, 0, 0, -12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		projection(cut = false, convexity = 0) {
+			cube(size = [10, 10, 10], center = false);
+			difference() {
+				sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
+				cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 5, r2 = 5, center = true);
 			}
 		}
 	}
-	multmatrix([[1, 0, 0, 0], [0, 1, 0, -10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-		projection(cut = true, convexity = 0) {
-			union() {
-				difference() {
-					cube(size = [5, 5, 5], center = true);
-					cube(size = [4, 4, 4], center = true);
-				}
-				multmatrix([[1, 0, 0, 2.1], [0, 1, 0, 2.1], [0, 0, 1, 0], [0, 0, 0, 1]]) {
-					difference() {
-						cube(size = [5, 5, 5], center = true);
-						cube(size = [4, 4, 4], center = true);
-					}
-				}
+	multmatrix([[1, 0, 0, 6], [0, 1, 0, -12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		projection(cut = false, convexity = 0) {
+			cube(size = [10, 10, 10], center = false);
+			difference() {
+				sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
+				cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 5, r2 = 5, center = true);
 			}
 		}
 	}
diff --git a/tests/regression/dumptest/render-2d-tests-expected.csg b/tests/regression/dumptest/render-2d-tests-expected.csg
index 75739b3..bcc5e96 100644
--- a/tests/regression/dumptest/render-2d-tests-expected.csg
+++ b/tests/regression/dumptest/render-2d-tests-expected.csg
@@ -1,8 +1,14 @@
 group() {
 	render(convexity = 1) {
 		difference() {
-			square(size = [100, 100], center = true);
-			circle($fn = 0, $fa = 12, $fs = 2, r = 30);
+			square(size = [10, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 3);
+		}
+	}
+	multmatrix([[1, 0, 0, 12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
+		render(convexity = 1) {
+			square(size = [10, 10], center = true);
+			circle($fn = 0, $fa = 12, $fs = 2, r = 3);
 		}
 	}
 }
diff --git a/tests/regression/opencsgtest/polygon-tests-expected.png b/tests/regression/opencsgtest/polygon-tests-expected.png
index fe84a80..94bd131 100644
--- a/tests/regression/opencsgtest/polygon-tests-expected.png
+++ b/tests/regression/opencsgtest/polygon-tests-expected.png
diff --git a/tests/regression/opencsgtest/projection-cut-tests-expected.png b/tests/regression/opencsgtest/projection-cut-tests-expected.png
new file mode 100644
index 0000000..5063301
--- /dev/null
+++ b/tests/regression/opencsgtest/projection-cut-tests-expected.png
diff --git a/tests/regression/opencsgtest/projection-tests-expected.png b/tests/regression/opencsgtest/projection-tests-expected.png
index b808ffe..b3af1e1 100644
--- a/tests/regression/opencsgtest/projection-tests-expected.png
+++ b/tests/regression/opencsgtest/projection-tests-expected.png
diff --git a/tests/regression/opencsgtest/render-2d-tests-expected.png b/tests/regression/opencsgtest/render-2d-tests-expected.png
index 0bf6288..47e57dd 100644
--- a/tests/regression/opencsgtest/render-2d-tests-expected.png
+++ b/tests/regression/opencsgtest/render-2d-tests-expected.png
diff --git a/tests/regression/throwntogethertest/polygon-tests-expected.png b/tests/regression/throwntogethertest/polygon-tests-expected.png
index 779b878..2ce6b75 100644
--- a/tests/regression/throwntogethertest/polygon-tests-expected.png
+++ b/tests/regression/throwntogethertest/polygon-tests-expected.png
diff --git a/tests/regression/throwntogethertest/projection-cut-tests-expected.png b/tests/regression/throwntogethertest/projection-cut-tests-expected.png
new file mode 100644
index 0000000..5063301
--- /dev/null
+++ b/tests/regression/throwntogethertest/projection-cut-tests-expected.png
diff --git a/tests/regression/throwntogethertest/projection-tests-expected.png b/tests/regression/throwntogethertest/projection-tests-expected.png
index b808ffe..b3af1e1 100644
--- a/tests/regression/throwntogethertest/projection-tests-expected.png
+++ b/tests/regression/throwntogethertest/projection-tests-expected.png
diff --git a/tests/regression/throwntogethertest/render-2d-tests-expected.png b/tests/regression/throwntogethertest/render-2d-tests-expected.png
index 0bf6288..47e57dd 100644
--- a/tests/regression/throwntogethertest/render-2d-tests-expected.png
+++ b/tests/regression/throwntogethertest/render-2d-tests-expected.png