basic segmenter

4 files changed, 145 insertions, 15 deletions

diff --git a/gui/addons.make b/gui/addons.make
index b708156..f1f1760 100644
--- a/gui/addons.make
+++ b/gui/addons.make
@@ -4,3 +4,5 @@ ofxHelios
 ofxOpenCV
 ofxSVG
 ofxXmlSettings
+ofxClipper
+
diff --git a/gui/obj/osx/Release/.compiler_flags b/gui/obj/osx/Release/.compiler_flags
index 2dda085..2cd3ce9 100644
--- a/gui/obj/osx/Release/.compiler_flags
+++ b/gui/obj/osx/Release/.compiler_flags
@@ -1 +1 @@
--Os -mtune=native -DNDEBUG -stdlib=libc++ -Wall -fexceptions -fpascal-strings -mmacosx-version-min=10.9 -D__MACOSX_CORE__ -fPIC -x objective-c++ -std=c++11 -I../../openFrameworks/libs/FreeImage/include -I../../openFrameworks/libs/boost/include -I../../openFrameworks/libs/boost/include/boost -I../../openFrameworks/libs/cairo/include -I../../openFrameworks/libs/cairo/include/cairo -I../../openFrameworks/libs/curl/include -I../../openFrameworks/libs/curl/include/curl -I../../openFrameworks/libs/fmodex/include -I../../openFrameworks/libs/freetype/include -I../../openFrameworks/libs/freetype/include/freetype2 -I../../openFrameworks/libs/freetype/include/freetype2/freetype -I../../openFrameworks/libs/freetype/include/freetype2/freetype/config -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal/services -I../../openFrameworks/libs/glew/include -I../../openFrameworks/libs/glew/include/GL -I../../openFrameworks/libs/glfw/include -I../../openFrameworks/libs/glfw/include/GLFW -I../../openFrameworks/libs/glm/include -I../../openFrameworks/libs/glm/include/glm -I../../openFrameworks/libs/glm/include/glm/detail -I../../openFrameworks/libs/glm/include/glm/gtc -I../../openFrameworks/libs/glm/include/glm/gtx -I../../openFrameworks/libs/glm/include/glm/simd -I../../openFrameworks/libs/json/include -I../../openFrameworks/libs/kiss/include -I../../openFrameworks/libs/pugixml/include -I../../openFrameworks/libs/rtAudio/include -I../../openFrameworks/libs/tess2/include -I../../openFrameworks/libs/uriparser/include -I../../openFrameworks/libs/uriparser/include/uriparser -I../../openFrameworks/libs/utf8/include -I../../openFrameworks/libs/utf8/include/utf8 -I../../openFrameworks/libs/utf8cpp/include -I../../openFrameworks/libs/utf8cpp/include/utf8 -I../../openFrameworks/libs/openFrameworks -I../../openFrameworks/libs/openFrameworks/3d -I../../openFrameworks/libs/openFrameworks/app -I../../openFrameworks/libs/openFrameworks/communication -I../../openFrameworks/libs/openFrameworks/events -I../../openFrameworks/libs/openFrameworks/gl -I../../openFrameworks/libs/openFrameworks/graphics -I../../openFrameworks/libs/openFrameworks/math -I../../openFrameworks/libs/openFrameworks/sound -I../../openFrameworks/libs/openFrameworks/types -I../../openFrameworks/libs/openFrameworks/utils -I../../openFrameworks/libs/openFrameworks/video -I/work/workspace/raverony/gui/libs -I/work/workspace/raverony/gui/src -I/work/workspace/openFrameworks/addons/ofxNDI/src -I/work/workspace/openFrameworks/addons/ofxNDI/libs -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/include -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib/osx -I/work/workspace/openFrameworks/addons/ofxGui/src -I/work/workspace/openFrameworks/addons/ofxHelios/src -I/work/workspace/openFrameworks/addons/ofxHelios/libs -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/includes -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/lib -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/lib/osx -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/include -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib/osx -I/work/workspace/openFrameworks/addons/ofxOpenCv/src -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2 -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/calib3d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/hal -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/features2d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/highgui -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgcodecs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ml -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/photo -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/shape -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/superres -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videoio -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videostab -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib/osx -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/license -I/work/workspace/openFrameworks/addons/ofxSvg/src -I/work/workspace/openFrameworks/addons/ofxSvg/libs -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2 -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include/libxml -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/license -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/license -I/work/workspace/openFrameworks/addons/ofxXmlSettings/src -I/work/workspace/openFrameworks/addons/ofxXmlSettings/libs -stdlib=libc++ -mmacosx-version-min=10.9 -v -framework Accelerate -framework QTKit -framework AGL -framework ApplicationServices -framework AudioToolbox -framework CoreAudio -framework CoreFoundation -framework CoreServices -framework OpenGL -framework IOKit -framework Cocoa -framework CoreVideo -framework AVFoundation -framework CoreMedia -framework QuartzCore -framework Security -framework LDAP
+-Os -mtune=native -DNDEBUG -stdlib=libc++ -Wall -fexceptions -fpascal-strings -mmacosx-version-min=10.9 -D__MACOSX_CORE__ -fPIC -x objective-c++ -std=c++11 -I../../openFrameworks/libs/FreeImage/include -I../../openFrameworks/libs/boost/include -I../../openFrameworks/libs/boost/include/boost -I../../openFrameworks/libs/cairo/include -I../../openFrameworks/libs/cairo/include/cairo -I../../openFrameworks/libs/curl/include -I../../openFrameworks/libs/curl/include/curl -I../../openFrameworks/libs/fmodex/include -I../../openFrameworks/libs/freetype/include -I../../openFrameworks/libs/freetype/include/freetype2 -I../../openFrameworks/libs/freetype/include/freetype2/freetype -I../../openFrameworks/libs/freetype/include/freetype2/freetype/config -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal/services -I../../openFrameworks/libs/glew/include -I../../openFrameworks/libs/glew/include/GL -I../../openFrameworks/libs/glfw/include -I../../openFrameworks/libs/glfw/include/GLFW -I../../openFrameworks/libs/glm/include -I../../openFrameworks/libs/glm/include/glm -I../../openFrameworks/libs/glm/include/glm/detail -I../../openFrameworks/libs/glm/include/glm/gtc -I../../openFrameworks/libs/glm/include/glm/gtx -I../../openFrameworks/libs/glm/include/glm/simd -I../../openFrameworks/libs/json/include -I../../openFrameworks/libs/kiss/include -I../../openFrameworks/libs/pugixml/include -I../../openFrameworks/libs/rtAudio/include -I../../openFrameworks/libs/tess2/include -I../../openFrameworks/libs/uriparser/include -I../../openFrameworks/libs/uriparser/include/uriparser -I../../openFrameworks/libs/utf8/include -I../../openFrameworks/libs/utf8/include/utf8 -I../../openFrameworks/libs/utf8cpp/include -I../../openFrameworks/libs/utf8cpp/include/utf8 -I../../openFrameworks/libs/openFrameworks -I../../openFrameworks/libs/openFrameworks/3d -I../../openFrameworks/libs/openFrameworks/app -I../../openFrameworks/libs/openFrameworks/communication -I../../openFrameworks/libs/openFrameworks/events -I../../openFrameworks/libs/openFrameworks/gl -I../../openFrameworks/libs/openFrameworks/graphics -I../../openFrameworks/libs/openFrameworks/math -I../../openFrameworks/libs/openFrameworks/sound -I../../openFrameworks/libs/openFrameworks/types -I../../openFrameworks/libs/openFrameworks/utils -I../../openFrameworks/libs/openFrameworks/video -I/work/workspace/raverony/gui/libs -I/work/workspace/raverony/gui/src -I/work/workspace/openFrameworks/addons/ofxNDI/src -I/work/workspace/openFrameworks/addons/ofxNDI/libs -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/include -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib/osx -I/work/workspace/openFrameworks/addons/ofxGui/src -I/work/workspace/openFrameworks/addons/ofxHelios/src -I/work/workspace/openFrameworks/addons/ofxHelios/libs -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/includes -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/lib -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/lib/osx -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/include -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib/osx -I/work/workspace/openFrameworks/addons/ofxOpenCv/src -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2 -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/calib3d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/hal -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/features2d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/highgui -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgcodecs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ml -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/photo -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/shape -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/superres -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videoio -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videostab -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib/osx -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/license -I/work/workspace/openFrameworks/addons/ofxSvg/src -I/work/workspace/openFrameworks/addons/ofxSvg/libs -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2 -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include/libxml -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/license -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/license -I/work/workspace/openFrameworks/addons/ofxXmlSettings/src -I/work/workspace/openFrameworks/addons/ofxXmlSettings/libs -I/work/workspace/openFrameworks/addons/ofxClipper/src -I/work/workspace/openFrameworks/addons/ofxClipper/libs -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper/src -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper/src/cpp -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/include -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/include/ofx -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/src -stdlib=libc++ -mmacosx-version-min=10.9 -v -framework Accelerate -framework QTKit -framework AGL -framework ApplicationServices -framework AudioToolbox -framework CoreAudio -framework CoreFoundation -framework CoreServices -framework OpenGL -framework IOKit -framework Cocoa -framework CoreVideo -framework AVFoundation -framework CoreMedia -framework QuartzCore -framework Security -framework LDAP
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 48f9fc0..0544fa3 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -30,7 +30,7 @@ void ofApp::setup(){
 	//============================ GUI
 
 	gui.add(contour_threshold.setup("threshold", 140, 0, 255));
-	gui.add(contour_simplify.setup("simplify", 0.2, 0.0, 1.0));
+	gui.add(contour_simplify.setup("simplify", 0.8, 0.0, 1.0));
 	gui.add(contour_useColour.setup("use colour", true));
 	gui.add(laser_R.setup("red", 140, 0, 255));
 	gui.add(laser_G.setup("green", 140, 0, 255));
@@ -40,6 +40,12 @@ void ofApp::setup(){
 	gui.add(shapes_randomise.setup("randomise shapes", true));
 	gui.add(shapes_amount.setup("shapes amount", 0.2, 0.0, 0.8));
 	gui.add(shapes_duration.setup("shape duration", 5, 0, 25));
+	gui.add(use_mask.setup("use mask", true));
+	gui.add(invert_mask.setup("invert mask", false));
+	gui.add(use_segmenter.setup("use segmenter", false));
+	gui.add(segmenter_speed.setup("segmenter speed", 0.2, -1.0, 1.0));
+	gui.add(segmenter_length.setup("segmenter length", 0.2, 0.0, 1.0));
+	gui.add(segmenter_number.setup("segmenter number", 1, 1, 8));
 
 	framecounter=0;
 
@@ -328,11 +334,14 @@ void ofApp::draw(){
 
 		glPopMatrix();
 
+		//================================== SVG + mask
+		
+		float scale=previewframesize.x/outputWindowSize.x;
+		
 		//================================== SVG
 
 		glPushMatrix();
 
-		float scale=previewframesize.x/outputWindowSize.x;
 
 		glTranslatef(230,300,0);
 
@@ -347,6 +356,29 @@ void ofApp::draw(){
 		}
 
 		glPopMatrix();
+
+		//================================== Mask
+
+		glPushMatrix();
+
+		glTranslatef(230,600,0);
+
+		ofDrawRectangle(20,20,previewframesize.x+4,previewframesize.y+4);
+
+		ofFill();
+
+		glTranslatef(22,22,0);
+
+		glScalef(scale,scale,scale);
+
+		for (auto& shape:mask){
+			shape.draw();
+		}
+
+		ofNoFill();
+
+		glPopMatrix();
+
 	}
 
 }
@@ -357,7 +389,13 @@ void ofApp::drawOutput(ofEventArgs & args){
 
 	ofSetColor(255,255,255);
 
-	vector <colourPolyline> laserOutput;
+	vector <colourPolyline> polyOutput;
+
+	float phase=fmod(ofGetElapsedTimef()*segmenter_speed,1);
+
+	while (phase<0.0f) {
+		phase+=1.0f;
+	}
 
 	switch (source){
 		case TEST:{
@@ -383,7 +421,7 @@ void ofApp::drawOutput(ofEventArgs & args){
 			    					lineTransformer::makePolygon(6,200)
 			    				)
 		    				);
-		    laserOutput.push_back(colourPolyline(poly,ofColor(laser_R,laser_G,laser_B)));
+		    polyOutput.push_back(colourPolyline(poly,ofColor(laser_R,laser_G,laser_B)));
 
 		}
 		case NDI:{
@@ -413,7 +451,7 @@ void ofApp::drawOutput(ofEventArgs & args){
 					shape.addVertex(p,contour_useColour?c:ofColor(laser_R,laser_G,laser_B));
 				}
 				shape.simplify(contour_simplify);
-		        laserOutput.push_back(shape);
+		        polyOutput.push_back(shape);
 		    }
 		    break;
 
@@ -436,7 +474,7 @@ void ofApp::drawOutput(ofEventArgs & args){
 						shape.addVertex(p,contour_useColour?c:ofColor(laser_R,laser_G,laser_B));
 					}
 					shape.simplify(contour_simplify);
-			        laserOutput.push_back(shape);
+			        polyOutput.push_back(shape);
 			    }
 			}
 			break;
@@ -448,19 +486,63 @@ void ofApp::drawOutput(ofEventArgs & args){
 					framecounter=shapes_duration;
 				}
 				for (auto s:shape_selection){
-					laserOutput.push_back(colourPolyline(segmenters[s].getPoly(),ofColor(laser_R,laser_G,laser_B)));
+					if (use_segmenter){
+						auto segments=segmenters[s].getSegments(segmenter_number,segmenter_length,phase);
+						for (auto segment=segments.begin();segment!=segments.end();segment++){
+							polyOutput.push_back(*segment);
+						}
+					}
+					else {
+						polyOutput.push_back(colourPolyline(segmenters[s].getPoly(),ofColor(laser_R,laser_G,laser_B)));
+					}
 				}
 				framecounter--;
 			}
 			else {
 				for (auto shape=segmenters.begin();shape!=segmenters.end();shape++){
-					laserOutput.push_back(colourPolyline(shape->getPoly(),ofColor(laser_R,laser_G,laser_B)));
+					if (use_segmenter){
+						auto segments=shape->getSegments(segmenter_number,segmenter_length,phase);
+						for (auto segment=segments.begin();segment!=segments.end();segment++){
+							polyOutput.push_back(*segment);
+						}
+					}
+					else {
+						polyOutput.push_back(colourPolyline(shape->getPoly(),ofColor(laser_R,laser_G,laser_B)));
+
+					}
 				}
 			}
 			break;
 		}
 	}
 
+	vector <colourPolyline> clippedOutput;
+
+	if (mask.size()&&use_mask){
+		clipper.Clear();
+		clipper.addPolylines(mask, ClipperLib::ptClip);
+		vector <ofPolyline> shapes; //TODO make clipper clip colourpolylines
+		for (auto& poly: polyOutput)
+	    {
+	    	shapes.push_back(poly);
+	    }
+		clipper.addPolylines(shapes,ClipperLib::ptSubject);
+		vector <ofPolyline> clipped;
+		if (invert_mask){
+			clipped = clipper.getClippedLines(ClipperLib::ctDifference);
+		}else {
+			clipped = clipper.getClippedLines(ClipperLib::ctIntersection);
+		}
+		for (auto& clip: clipped)
+	    {
+	    	clip.simplify(contour_simplify);
+	        clippedOutput.push_back(colourPolyline(clip,ofColor(laser_R,laser_G,laser_B)));
+	    }
+	}
+	else {
+		clippedOutput=polyOutput;
+	}
+
 	glm::vec2 src[]={
     	glm::vec2(0,0),
     	glm::vec2(ofGetWidth(),0),
@@ -483,18 +565,19 @@ void ofApp::drawOutput(ofEventArgs & args){
     vector <colourPolyline> warpedOutput;
     vector <colourPolyline> scaledWarpedOutput;
 
-    for (auto s:laserOutput){
+    for (auto s:clippedOutput){
     	warpedOutput.push_back(lineTransformer::polyLineTransform(warp,s));
     	scaledWarpedOutput.push_back(lineTransformer::polyLineTransform(scaled_warp,s));
     }
 
 	int num = 0;
+	int pnum=0;
 
-	if (laserOutput.size()){
+	if (polyOutput.size()){
 		num=laser.draw(scaledWarpedOutput);
-
 		for (auto& shape:warpedOutput){
 			shape.draw();
+			pnum+=shape.size();
 		}
 	}
 
@@ -506,7 +589,8 @@ void ofApp::drawOutput(ofEventArgs & args){
         ofSetWindowTitle(ofToString(ofGetFrameRate(), 2)+" fps laser points: "+ofToString(num));
     }
     else {
-        ofSetWindowTitle(ofToString(ofGetFrameRate(), 2)+" fps laser error ");
+
+        ofSetWindowTitle(ofToString(ofGetFrameRate(), 2)+" fps laser error points: "+ofToString(pnum));
     }
 
 }
@@ -726,6 +810,34 @@ void ofApp::dragEvent(ofDragInfo dragInfo){
 
 	}
 
+	if (dragInfo.position.x>250&&dragInfo.position.x<570&&dragInfo.position.y>620&&dragInfo.position.y<866){
+		std::string filename= *dragInfo.files.begin();
+		svg.load(filename);
+		vector <ofPath> imagepaths= svg.getPaths();
+
+		std::stringstream strm;
+
+		if (imagepaths.size()){
+			mask.clear();
+			for (auto& path:imagepaths){
+				path.setPolyWindingMode(OF_POLY_WINDING_ODD);
+
+				vector <ofPolyline> outlines= path.getOutline();
+				for (auto& outline:outlines){
+					strm << outline.size() << "->";
+					outline.simplify(contour_simplify);
+					strm << outline.size() << " ";
+					mask.push_back(outline);
+				}
+				strm << " , ";	
+			}
+
+			cout << "Mask: found " << imagepaths.size() << " paths with " << mask.size() << " shapes [ " << strm.str() << " ]" <<std::endl;
+
+		}
+
+	}
+
 }
 
 	//printf("%s at %i %i \n",dragInfo.files.begin(),dragInfo.position.x,dragInfo.position.y);
diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 8865da5..14d9934 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -9,6 +9,7 @@
 #include "ofxSVG.h"
 #include "lineSegmenter.h"
 #include "ofxXmlSettings.h"
+#include "ofxClipper.h"
 
 enum Source{
 	TEST,
@@ -81,7 +82,7 @@ class ofApp: public ofBaseApp {
 		// For received frame fps calculations
 		double startTime, lastTime, frameTime, frameRate, fps;
 
-		//====== video input gui
+		//====== gui
 
 		ofxIntSlider contour_threshold;
 		ofxFloatSlider contour_simplify;
@@ -91,9 +92,19 @@ class ofApp: public ofBaseApp {
 		ofxIntSlider laser_B;
 		ofxIntSlider laser_intensity;
 		ofxIntSlider laser_points;
+
+		//svg gui
 		ofxToggle	 shapes_randomise;
-		ofxFloatSlider	 shapes_amount;
+		ofxFloatSlider shapes_amount;
 		ofxIntSlider shapes_duration;
+		ofxToggle use_mask;
+		ofxToggle invert_mask;
+
+		//segmenter
+		ofxToggle use_segmenter;
+		ofxFloatSlider segmenter_speed;
+		ofxFloatSlider segmenter_length;
+		ofxIntSlider segmenter_number;
 
 		//======================================= //video player
 
@@ -106,6 +117,11 @@ class ofApp: public ofBaseApp {
 		set <int> shape_selection;
 		int framecounter;
 
+		//======================================= //Mask clipping
+
+		vector <ofPolyline> mask;
+		ofx::Clipper clipper;
+
 		//======================================= //positioning interface
 
 		bool bShowPositionInterface;