Ported recent changes to master into the visitor branch

1 files changed, 74 insertions, 28 deletions

diff --git a/src/cgaladv_minkowski2.cc b/src/cgaladv_minkowski2.cc
index 85a0b2b..8d0bf62 100644
--- a/src/cgaladv_minkowski2.cc
+++ b/src/cgaladv_minkowski2.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
@@ -30,20 +31,53 @@
 #include "grid.h"
 #include "cgal.h"
 
-#if 0
 
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/minkowski_sum_2.h>
 
 extern CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2 a, CGAL_Nef_polyhedron2 b);
+extern CGAL_Poly2 nef2p2(CGAL_Nef_polyhedron2 p);
 
-struct K2 : public CGAL::Exact_predicates_exact_constructions_kernel {};
-typedef CGAL::Polygon_2<K2> Poly2;
-typedef CGAL::Polygon_with_holes_2<K2> Poly2h;
+//-----------------------------------------------------------------------------
+// Pretty-print a CGAL polygon.
+//
+template<class Kernel, class Container>
+void print_polygon (const CGAL::Polygon_2<Kernel, Container>& P)
+{
+  typename CGAL::Polygon_2<Kernel, Container>::Vertex_const_iterator  vit;
+
+  std::cout << "[ " << P.size() << " vertices:";
+  for (vit = P.vertices_begin(); vit != P.vertices_end(); ++vit)
+    std::cout << " (" << *vit << ')';
+  std::cout << " ]" << std::endl;
+}
 
-static Poly2 nef2p2(CGAL_Nef_polyhedron2 p)
+//-----------------------------------------------------------------------------
+// Pretty-print a polygon with holes.
+//
+template<class Kernel, class Container>
+void print_polygon_with_holes (const CGAL::Polygon_with_holes_2<Kernel, Container>& pwh) { 
+  if (! pwh.is_unbounded()) { 
+		std::cout << "{ Outer boundary = ";
+		print_polygon (pwh.outer_boundary());
+	} else
+    std::cout << "{ Unbounded polygon." << std::endl;
+
+  typename CGAL::Polygon_with_holes_2<Kernel,Container>::Hole_const_iterator  hit;
+  unsigned int k = 1;
+
+  std::cout << "  " << pwh.number_of_holes() << " holes:" << std::endl;
+  for (hit = pwh.holes_begin(); hit != pwh.holes_end(); ++hit, ++k) { 
+    std::cout << "    Hole #" << k << " = ";
+    print_polygon (*hit);
+  }
+  std::cout << " }" << std::endl;
+
+  return;
+}
+
+CGAL_Poly2 nef2p2(CGAL_Nef_polyhedron2 p)
 {
-	std::list<K2::Point_2> points;
+	std::list<CGAL_ExactKernel2::Point_2> points;
 	Grid2d<int> grid(GRID_COARSE);
 
 	typedef CGAL_Nef_polyhedron2::Explorer Explorer;
@@ -53,7 +87,11 @@ static Poly2 nef2p2(CGAL_Nef_polyhedron2 p)
 
 	for (fci_t fit = E.faces_begin(), fend = E.faces_end(); fit != fend; ++fit)
 	{
-		if (fit != E.faces_begin()) {
+		if (!E.mark(fit)) {
+			continue;
+		}
+		//if (fit != E.faces_begin()) {
+		if (points.size() != 0) {
 			PRINT("WARNING: minkowski() is not implemented for 2d objects with holes!");
 			break;
 		}
@@ -64,33 +102,41 @@ static Poly2 nef2p2(CGAL_Nef_polyhedron2 p)
 				Explorer::Point ep = E.point(E.target(fcirc));
 				double x = to_double(ep.x()), y = to_double(ep.y());
 				grid.align(x, y);
-				points.push_back(K2::Point_2(x, y));
+				points.push_back(CGAL_ExactKernel2::Point_2(x, y));
 			}
 		}
 	}
 
-	return Poly2(points.begin(), points.end());
+	return CGAL_Poly2(points.begin(), points.end());
 }
-
-CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2 a, CGAL_Nef_polyhedron2 b)
-{
-	Poly2 ap = nef2p2(a), bp = nef2p2(b);
-	Poly2h x = minkowski_sum_2(ap, bp);
-	/** FIXME **/
-	
-	PRINT("WARNING: minkowski() is not implemented yet for 2d objects!");
-	return CGAL_Nef_polyhedron2();
+static CGAL_Nef_polyhedron2 p2nef2(CGAL_Poly2 p2) {
+  std::list<CGAL_Nef_polyhedron2::Point> points;
+  for (size_t j = 0; j < p2.size(); j++) {
+    double x = to_double(p2[j].x());
+    double y = to_double(p2[j].y());
+    CGAL_Nef_polyhedron2::Point p = CGAL_Nef_polyhedron2::Point(x, y);
+    points.push_back(p);
+  }
+  return CGAL_Nef_polyhedron2(points.begin(), points.end(), CGAL_Nef_polyhedron2::INCLUDED);
 }
 
-#else
-
-CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2, CGAL_Nef_polyhedron2)
+CGAL_Nef_polyhedron2 minkowski2(CGAL_Nef_polyhedron2 a, CGAL_Nef_polyhedron2 b)
 {
-	PRINT("WARNING: minkowski() is not implemented yet for 2d objects!");
-	return CGAL_Nef_polyhedron2();
+	CGAL_Poly2 ap = nef2p2(a), bp = nef2p2(b);
+
+	if (ap.size() == 0) {
+		PRINT("WARNING: minkowski() could not get any points from object 1!");
+		return CGAL_Nef_polyhedron2();
+	} else if (bp.size() == 0) {
+		PRINT("WARNING: minkowski() could not get any points from object 2!");
+		return CGAL_Nef_polyhedron2();
+	} else {
+		CGAL_Poly2h x = minkowski_sum_2(ap, bp);
+
+		// Make a CGAL_Nef_polyhedron2 out of just the boundary for starters
+		return p2nef2(x.outer_boundary());
+	}	
 }
 
 #endif
 
-#endif
-