1 files changed, 41 insertions, 15 deletions

diff --git a/drawing/src/ofApp.cpp b/drawing/src/ofApp.cpp
index 43069d2..e888d4d 100644
--- a/drawing/src/ofApp.cpp
+++ b/drawing/src/ofApp.cpp
@@ -9,18 +9,24 @@ void ofApp::setup(){
 	vector <ofPath> paths= svg.getPaths();
 
 	for (int i=0;i<paths.size();i++){
+		vector <ofPolyline> outlines= paths[i].getOutline();
+		for (int j=0;j<outlines.size();j++){
+			segmenters.push_back(lineSegmenter(outlines[j]));
+		}	
+	}
 
-		paths[i].setMode(ofPath::COMMANDS);
+	cout << "Drawing: found " << paths.size() << " paths with " << segmenters.size() << " shapes" <<std::endl;
 
+	svg.load("lorenzo.svg");
+	paths= svg.getPaths();
+	for (int i=0;i<paths.size();i++){
 		vector <ofPolyline> outlines= paths[i].getOutline();
-
 		for (int j=0;j<outlines.size();j++){
-			segmenters.push_back(lineSegmenter(outlines[j]));
+			mask.push_back(outlines[j]);
 		}
-		
 	}
 
-	cout << "Found " << paths.size() << " paths with " << segmenters.size() << " shapes" <<std::endl;
+	cout << "Mask: found " << paths.size() << " paths with " << mask.size() << " shapes" <<std::endl;
 
 	numsegments=1;
 	coverage=0.5;
@@ -33,8 +39,9 @@ void ofApp::setup(){
 //--------------------------------------------------------------
 void ofApp::update(){
 
+	clipper.Clear();
 	
-
+	clipper.addPolylines(mask, ClipperLib::ptClip);
 }
 
 
@@ -44,34 +51,53 @@ void ofApp::draw(){
 	ofBackground(0,0,0);
 	ofSetColor(255,255,255);
 
-	glTranslatef(-80,-130,0);
-
 	int segmentsdrawn=0;
+	int pointsdrawn=0;
+
+	float phase=fmod(ofGetElapsedTimef()/2,1);
 
 	switch (mode){
 		case 0:{
-			float phase=fmod(ofGetElapsedTimef(),1);
-
-			
-
 			for (auto shape=segmenters.begin();shape!=segmenters.end();shape++){
 				auto segments=shape->getSegments(numsegments,coverage,phase);
 				for (auto segment=segments.begin();segment!=segments.end();segment++){
 					segment->draw();
-					segmentsdrawn++;
+					segmentsdrawn+=1;
+					pointsdrawn+=segment->size();
 				}
 			}
+			break;
 		}
 		case 1:{
+			vector <ofPolyline> shapes;
+			for (auto shape=segmenters.begin();shape!=segmenters.end();shape++){
+				auto segments=shape->getSegments(numsegments,coverage,phase);
+				for (auto segment=segments.begin();segment!=segments.end();segment++){
+					shapes.push_back(*segment);
+				}
+			}
+			clipper.addPolylines(shapes,ClipperLib::ptSubject);
+			vector<ofPolyline> clipped = clipper.getClipped(ClipperLib::ctIntersection);
+			segmentsdrawn=clipped.size();
+			for (auto& clip: clipped)
+		    {
+		        clip.draw();
+		        pointsdrawn+=clip.size();
+		    }
+		}
+		case 2:{
 			int w=ofRandom(1000);
 			segmenters[w%segmenters.size()].draw();
+			segmentsdrawn=1;
+			pointsdrawn+=segmenters[w%segmenters.size()].size();
+			break;
 		}
 	}
 
 	
 
 	std::stringstream strm;
-	strm << "segments: "<<segmentsdrawn;
+	strm << "segments: "<<segmentsdrawn<< " points: "<<pointsdrawn;
 	ofSetWindowTitle(strm.str());
 
 	mainOutputSyphonServer.publishScreen();
@@ -115,7 +141,7 @@ void ofApp::keyReleased(int key){
 			break;
 		}
 		case 'p':{
-			mode=(mode==1?0:1);
+			mode=(mode+1)%3;
 			break;
 		}
 	}