Merge branch 'master' of github.com:openscad/openscad

10 files changed, 24 insertions, 4 deletions

diff --git a/testdata/scad/features/polygon-tests.scad b/testdata/scad/features/polygon-tests.scad
index b4e92b6..0cd259f 100644
--- a/testdata/scad/features/polygon-tests.scad
+++ b/testdata/scad/features/polygon-tests.scad
@@ -15,4 +15,10 @@ translate([-2,0,0]) polygon(points);
 translate([-2,-2,0]) polygon(points=points, paths=[[0,1,2,3], [4,5,6,7]]);
 translate([2,-4,0]) polygon([[0,0], [1,0], [1,1], [0,0]]);
 
+// With hole
+translate([-2,-4,0])
+  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]]
+);
+
 // FIXME: convexity
diff --git a/testdata/scad/features/render-2d-tests.scad b/testdata/scad/features/render-2d-tests.scad
index 683ffe4..f8df115 100644
--- a/testdata/scad/features/render-2d-tests.scad
+++ b/testdata/scad/features/render-2d-tests.scad
@@ -1,6 +1,11 @@
 render() {
   difference() {
-    square(100, center=true);
-    circle(r=30);
+    square(10, center=true);
+    circle(r=3);
   }
 }
+
+translate([12,0,0]) render() {
+  square(10, center=true);
+  circle(r=3);
+}
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/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/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/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/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