many changes

1 files changed, 48 insertions, 7 deletions

diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index 3f5acc1..ae0ef60 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -4,6 +4,19 @@
 #include "lineTransformer.h"
 #include "ofxNDI.h"
 #include "ofxGui.h"
+#include "ofxHelios.h"
+#include "ofxOpenCv.h"
+#include "ofxSVG.h"
+#include "lineSegmenter.h"
+
+enum Source{
+	TEST,
+	NDI,
+	Player,
+	SVG_outlines,
+	SVG_segmenters,
+	Source_end
+};
 
 class ofApp: public ofBaseApp {
 
@@ -32,6 +45,8 @@ class ofApp: public ofBaseApp {
 		void outputMouseReleased(ofMouseEventArgs & args);
 		void outputWindowResized(ofResizeEventArgs &resizeargs);	
 
+		void select_random_shapes();
+
 		bool commandPressed;
 
 		glm::vec2 warpframe[4];
@@ -40,6 +55,16 @@ class ofApp: public ofBaseApp {
 
 		ofxPanel gui;
 
+		ofxHelios laser;
+
+		int source;
+
+		//======================================== //thresholding
+
+		ofxCvColorImage			colorImg;
+        ofxCvGrayscaleImage 	grayImage;
+        ofxCvContourFinder 	contourFinder;
+
 		//======================================== //ofxNDI
 
 		ofxNDIreceiver ndiReceiver;
@@ -53,13 +78,29 @@ class ofApp: public ofBaseApp {
 		// For received frame fps calculations
 		double startTime, lastTime, frameTime, frameRate, fps;
 
-		//====== gui
+		//====== video input gui
+
+		ofxIntSlider contour_threshold;
+		ofxFloatSlider contour_simplify;
+		ofxToggle	 contour_useColour;
+		ofxIntSlider laser_R;
+		ofxIntSlider laser_G;
+		ofxIntSlider laser_B;
+		ofxIntSlider laser_intensity;
+		ofxIntSlider laser_points;
+		ofxToggle	 shapes_randomise;
+		ofxFloatSlider	 shapes_amount;
+		ofxIntSlider shapes_duration;
+
+		//======================================= //video player
+
+		ofVideoPlayer 		movie;
+
+		//======================================= //SVG player
 
-		ofxIntSlider NDIthreshold;
-		ofxIntSlider NDIsimplify;
-		ofxToggle	 NDIuseColour;
-		ofxIntSlider NDIcolR;
-		ofxIntSlider NDIcolG;
-		ofxIntSlider NDIcolB;
+		ofxSVG svg;
+		vector <lineSegmenter> segmenters;
+		set <int> shape_selection;
+		int framecounter;
 
 };