vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #189 from openscad/issue188 

Issue188
felipesanches-svg
Marius Kintel 2012-08-27 20:35:39 -07:00
parent 0e9d66f532 2ac3286290
commit aab3c36f90
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CGALEvaluator.cc
View File

@ -150,9 +150,14 @@ CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node)
}
else if (dim == 3) {
CGAL_Polyhedron P;
chN.p3->convert_to_Polyhedron(P);
std::transform(P.vertices_begin(), P.vertices_end(), std::back_inserter(points3d),
boost::bind(static_cast<const CGAL_Polyhedron::Vertex::Point_3&(CGAL_Polyhedron::Vertex::*)() const>(&CGAL_Polyhedron::Vertex::point), _1));
if (!chN.p3->is_simple()) {
PRINT("Hull() currently requires a valid 2-manifold. Please modify your design. See http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/STL_Import_and_Export");
}
else {
chN.p3->convert_to_Polyhedron(P);
std::transform(P.vertices_begin(), P.vertices_end(), std::back_inserter(points3d),
boost::bind(static_cast<const CGAL_Polyhedron::Vertex::Point_3&(CGAL_Polyhedron::Vertex::*)() const>(&CGAL_Polyhedron::Vertex::point), _1));
}
}
chnode->progress_report();
}
@ -165,7 +170,8 @@ CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node)
}
else if (dim == 3) {
CGAL_Polyhedron P;
CGAL::convex_hull_3(points3d.begin(), points3d.end(), P);
if (points3d.size()>3)
CGAL::convex_hull_3(points3d.begin(), points3d.end(), P);
N = CGAL_Nef_polyhedron(new CGAL_Nef_polyhedron3(P));
}
return N;

11
testdata/scad/features/hull3-tests.scad vendored
View File

@ -15,3 +15,14 @@ translate([25,0,0]) hull() {
cylinder(r=5, h=5, center=true);
}
}
// Don't Crash (issue 188)
translate([-5,-5,-5]) {
hull() {
intersection(){
cube([1,1,1]);
translate([-1,-1,-1]) cube([1,1,1]);
}
}