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

Conflicts:
	src/CGAL_Nef_polyhedron.cc
	tests/CMakeLists.txt

1 files changed, 26 insertions, 1 deletions

diff --git a/testdata/scad/features/polyhedron-tests.scad b/testdata/scad/features/polyhedron-tests.scad
index 690d962..1f11d7e 100644
--- a/testdata/scad/features/polyhedron-tests.scad
+++ b/testdata/scad/features/polyhedron-tests.scad
@@ -11,10 +11,35 @@ module polyhedrons() {
  translate([4,0,0])
   polyhedron(points = [[1,0,0],[-1,0,0],[0,1,0],[0,-1,0],[0,0,1],[0,0,-1]],
             triangles = [[0,2,4],[0,5,2],[0,4,3],[0,3,5],[1,4,2],[1,2,5],[1,3,4], [1,5,3]]);
+
+// Containing concave polygons
+translate([6,0,0])
+polyhedron(points=[
+        [-0.8,-0.8,-0.8],
+        [0,0,-0.8],
+        [0.8,-0.8,-0.8],
+        [0.8,0.8,-0.8],
+        [-0.8,0.8,-0.8],
+        [-0.8,-0.8,0.8],
+        [0,0,0.8],
+        [0.8,-0.8,0.8],
+        [0.8,0.8,0.8],
+        [-0.8,0.8,0.8],
+    ],
+    triangles=[
+        [0,1,2,3,4],
+        [5,6,1,0],
+        [6,7,2,1],
+        [7,8,3,2],
+        [8,9,4,3],
+        [9,5,0,4],
+        [9,8,7,6,5],
+    ], convexity=2);
 }
 
 polyhedrons();
 translate([0,2,0]) difference() {
   polyhedrons();
-  translate([2,0,2]) cube([8,3,3], center=true);
+  translate([3,0,2]) cube([8,3,3], center=true);
 }
+