diff options
| author | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-04-12 18:35:44 (GMT) |
| commit | d24b3cc84d0701a5423925765e515db7df9614c5 (patch) | |
| tree | 0d63867d8b5a3c6ffe107371caa6b29cf8ad0f02 /src/cgaladv.cc | |
| parent | 633343c47e0d2bced64d47f62e814489b8e76dc2 (diff) | |
| parent | 1754a970a76c071fff91cc7c716aa0b78b4ac6be (diff) | |
Ported recent changes to master into the visitor branch
Diffstat (limited to 'src/cgaladv.cc')
| -rw-r--r-- | src/cgaladv.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/cgaladv.cc b/src/cgaladv.cc index 0e89ed5..50d2a15 100644 --- a/src/cgaladv.cc +++ b/src/cgaladv.cc @@ -1,6 +1,7 @@ /* - * OpenSCAD (www.openscad.at) - * Copyright (C) 2009 Clifford Wolf <clifford@clifford.at> + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,12 +37,14 @@ #ifdef ENABLE_CGAL extern CGAL_Nef_polyhedron3 minkowski3(CGAL_Nef_polyhedron3 a, CGAL_Nef_polyhedron3 b); extern CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2 a, CGAL_Nef_polyhedron2 b); +extern CGAL_Nef_polyhedron2 convexhull2(std::list<CGAL_Nef_polyhedron2> a); #endif enum cgaladv_type_e { MINKOWSKI, GLIDE, - SUBDIV + SUBDIV, + HULL }; class CgaladvModule : public AbstractModule @@ -143,6 +146,7 @@ void register_builtin_cgaladv() builtin_modules["minkowski"] = new CgaladvModule(MINKOWSKI); builtin_modules["glide"] = new CgaladvModule(GLIDE); builtin_modules["subdiv"] = new CgaladvModule(SUBDIV); + builtin_modules["hull"] = new CgaladvModule(HULL); } std::string CgaladvNode::toString() const @@ -160,6 +164,9 @@ std::string CgaladvNode::toString() const case SUBDIV: stream << "(level = " << this->level << ", convexity = " << this->convexity << ")"; break; + case HULL: + stream << "()"; + break; default: assert(false); } |