mirror of https://github.com/vitalif/openscad
Merge branch 'master' into local-scope
commit
e09d1df0e1
|
@ -141,6 +141,9 @@ CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node)
|
|||
PRINT("WARNING: hull() does not support mixing 2D and 3D objects.");
|
||||
continue;
|
||||
}
|
||||
if (chN.isNull()) { // If one of the children evaluated to a null object
|
||||
continue;
|
||||
}
|
||||
if (dim == 2) {
|
||||
CGAL_Nef_polyhedron2::Explorer explorer = chN.p2->explorer();
|
||||
BOOST_FOREACH(const CGAL_Nef_polyhedron2::Explorer::Vertex &vh,
|
||||
|
|
|
@ -31,7 +31,15 @@ module hull2dForLoop() {
|
|||
}
|
||||
}
|
||||
|
||||
module hull2null() {
|
||||
hull() {
|
||||
square(0);
|
||||
circle(0);
|
||||
}
|
||||
}
|
||||
|
||||
convex2dHole();
|
||||
translate([40,0,0]) convex2dSimple();
|
||||
translate([0,-20,0]) concave2dSimple();
|
||||
translate([30,-25,0]) hull2dForLoop();
|
||||
hull2null();
|
|
@ -26,3 +26,12 @@ translate([-5,-5,-5]) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
module hull3null() {
|
||||
hull() {
|
||||
cube(0);
|
||||
sphere(0);
|
||||
}
|
||||
}
|
||||
hull3null();
|
||||
|
||||
|
|
|
@ -56,4 +56,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
group() {
|
||||
hull() {
|
||||
square(size = [0, 0], center = false);
|
||||
circle($fn = 0, $fa = 12, $fs = 2, r = 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -27,4 +27,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
group() {
|
||||
hull() {
|
||||
cube(size = [0, 0, 0], center = false);
|
||||
sphere($fn = 0, $fa = 12, $fs = 2, r = 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue