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

1 files changed, 30 insertions, 2 deletions

diff --git a/src/cgalutils.cc b/src/cgalutils.cc
index e39c495..51838df 100644
--- a/src/cgalutils.cc
+++ b/src/cgalutils.cc
@@ -81,7 +81,7 @@ public:
 			const CGALPoint &p = vertices[i];
 			B.add_vertex(p);
 #ifdef GEN_SURFACE_DEBUG
-			printf("%d: %f %f %f\n", i, p[0], p[1], p[2]);
+			printf("%d: %f %f %f\n", i, p.x().to_double(), p.y().to_double(), p.z().to_double());
 #endif
 		}
 
@@ -136,7 +136,7 @@ CGAL_Polyhedron *createPolyhedronFromPolySet(const PolySet &ps)
 		CGAL_Build_PolySet builder(ps);
 		P->delegate(builder);
 	}
-	catch (CGAL::Assertion_exception e) {
+	catch (const CGAL::Assertion_exception &e) {
 		PRINTB("CGAL error in CGAL_Build_PolySet: %s", e.what());
 		delete P;
 		P = NULL;
@@ -145,5 +145,33 @@ CGAL_Polyhedron *createPolyhedronFromPolySet(const PolySet &ps)
 	return P;
 }
 
+CGAL_Iso_cuboid_3 bounding_box( const CGAL_Nef_polyhedron3 &N )
+{
+	CGAL_Iso_cuboid_3 result(-1,-1,-1,1,1,1);
+	CGAL_Nef_polyhedron3::Vertex_const_iterator vi;
+	std::vector<CGAL_Nef_polyhedron3::Point_3> points;
+	// can be optimized by rewriting bounding_box to accept vertices
+	CGAL_forall_vertices( vi, N )
+		points.push_back( vi->point() );
+	if (points.size())
+		result = CGAL::bounding_box( points.begin(), points.end() );
+	return result;
+}
+
+CGAL_Iso_rectangle_2e bounding_box( const CGAL_Nef_polyhedron2 &N )
+{
+	CGAL_Iso_rectangle_2e result(-1,-1,1,1);
+	CGAL_Nef_polyhedron2::Explorer explorer = N.explorer();
+	CGAL_Nef_polyhedron2::Explorer::Vertex_const_iterator vi;
+	std::vector<CGAL_Point_2e> points;
+	// can be optimized by rewriting bounding_box to accept vertices
+	for ( vi = explorer.vertices_begin(); vi != explorer.vertices_end(); ++vi )
+		if ( explorer.is_standard( vi ) )
+			points.push_back( explorer.point( vi ) );
+	if (points.size())
+		result = CGAL::bounding_box( points.begin(), points.end() );
+	return result;
+}
+
 #endif /* ENABLE_CGAL */