WIP trying to clip

1 files changed, 22 insertions, 19 deletions

diff --git a/nextus/src/lineClipper.cpp b/nextus/src/lineClipper.cpp
index bbfa9eb..eb9c480 100644
--- a/nextus/src/lineClipper.cpp
+++ b/nextus/src/lineClipper.cpp
@@ -2,32 +2,35 @@
 
 vector <colourPolyline> lineClipper::mask(
 	vector <colourPolyline> shapes,
-	vector <ofPolyline> mask,
+	ofRectangle frame,
 	bool invert
 	)
 {
 	vector <colourPolyline> output;
 
 	ofx::Clipper clipper;
+	
+	clipper.Clear();
+	clipper.addRectangle(frame, ClipperLib::ptClip, true);
+	vector <ofPolyline> polys; //TODO make clipper clip colourpolylines
+
+	for (auto& shape: shapes) polys.push_back(shape);
+    
+    clipper.addPolylines(polys,ClipperLib::ptSubject);
 		
-	for (auto& shape: shapes)
-    {	
-    	clipper.Clear();
-		clipper.addPolylines(mask, ClipperLib::ptClip);
-		vector <ofPolyline> polys; //TODO make clipper clip colourpolylines
-    	shapes.push_back(shape);
-    	clipper.addPolylines(polys,ClipperLib::ptSubject);
-		vector <ofPolyline> clipped;
-		if (invert){
-			clipped = clipper.getClipped(ClipperLib::ctDifference);
-		}else {
-			clipped = clipper.getClipped(ClipperLib::ctIntersection);
-		}
-		for (auto& clip: clipped)
-	    {
-	    	//clip.simplify(contour_simplify);
-	        output.push_back(colourPolyline(clip,shape.getColourAt(0)));
-	    }
+	vector <ofPolyline> clipped;
+
+	if (invert){
+		clipped = clipper.getClipped(ClipperLib::ctDifference);
+	}else {
+		clipped = clipper.getClipped(ClipperLib::ctIntersection);
+	}
+
+	for (auto& clip: clipped)
+    {
+    	//clip.simplify(contour_simplify);
+        output.push_back(colourPolyline(clip,shapes[0].getColourAt(0)));
     }
+   
     return output;
 }
\ No newline at end of file