1 files changed, 54 insertions, 9 deletions

diff --git a/drawing/src/ofApp.cpp b/drawing/src/ofApp.cpp
index f4a00b5..43069d2 100644
--- a/drawing/src/ofApp.cpp
+++ b/drawing/src/ofApp.cpp
@@ -5,7 +5,7 @@
 //--------------------------------------------------------------
 void ofApp::setup(){
 	ofxSVG svg;
-	svg.load("shapes.svg");
+	svg.load("haring.svg");
 	vector <ofPath> paths= svg.getPaths();
 
 	for (int i=0;i<paths.size();i++){
@@ -15,12 +15,17 @@ void ofApp::setup(){
 		vector <ofPolyline> outlines= paths[i].getOutline();
 
 		for (int j=0;j<outlines.size();j++){
-			segments.push_back(lineSegmenter(outlines[j]));
+			segmenters.push_back(lineSegmenter(outlines[j]));
 		}
 		
 	}
 
-	cout << "Found " << segments.size() << " segments";
+	cout << "Found " << paths.size() << " paths with " << segmenters.size() << " shapes" <<std::endl;
+
+	numsegments=1;
+	coverage=0.5;
+
+	mode=0;
     
 	ofSetFrameRate(30); 
 }
@@ -39,20 +44,38 @@ void ofApp::draw(){
 	ofBackground(0,0,0);
 	ofSetColor(255,255,255);
 
-	glTranslatef(128,128,0);
+	glTranslatef(-80,-130,0);
 
-	
+	int segmentsdrawn=0;
 
-	
+	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++;
+				}
+			}
+		}
+		case 1:{
+			int w=ofRandom(1000);
+			segmenters[w%segmenters.size()].draw();
+		}
+	}
 
-	//svg.draw();
+	
 
 	std::stringstream strm;
-	strm << "segments: "<<segments.size();
+	strm << "segments: "<<segmentsdrawn;
 	ofSetWindowTitle(strm.str());
 
+	mainOutputSyphonServer.publishScreen();
+
 }
 
 
@@ -74,6 +97,28 @@ void ofApp::keyPressed(ofKeyEventArgs &args){
 
 //--------------------------------------------------------------
 void ofApp::keyReleased(int key){
+	switch(key){
+		case '[':{
+			numsegments=max(0,numsegments-1);
+			break;
+		}
+		case ']':{
+			numsegments++;
+			break;
+		}	
+		case '{':{
+			coverage=coverage*0.9f;
+			break;
+		}
+		case '}':{
+			coverage=min(coverage/0.9f,1.0f);
+			break;
+		}
+		case 'p':{
+			mode=(mode==1?0:1);
+			break;
+		}
+	}
 	
 }