many changes

1 files changed, 34 insertions, 7 deletions

diff --git a/gui/src/ofApp.h b/gui/src/ofApp.h
index d28f393..3f5acc1 100644
--- a/gui/src/ofApp.h
+++ b/gui/src/ofApp.h
@@ -2,19 +2,17 @@
 
 #include "ofMain.h"
 #include "lineTransformer.h"
+#include "ofxNDI.h"
+#include "ofxGui.h"
 
 class ofApp: public ofBaseApp {
 
 	public:
 		void setup();
 		void update();
-		void updateGui(ofEventArgs & args);
 		void draw();
 		void exit();
 
-		void drawGui(ofEventArgs & args);
-		void guiKeyPressed(ofKeyEventArgs & args);
-
 		void keyPressed(ofKeyEventArgs &keyargs);
 		void keyReleased(int key);
 		void mouseMoved(int x, int y );
@@ -25,14 +23,43 @@ class ofApp: public ofBaseApp {
 		void mouseExited(int x, int y);
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
-
-		void guiWindowResized(ofResizeEventArgs &resizeargs);
+	
+		void updateOutput(ofEventArgs & args);
+		void drawOutput(ofEventArgs & args);
+		void outputKeyPressed(ofKeyEventArgs & args);
+		void outputMouseDragged(ofMouseEventArgs & args);
+		void outputMousePressed(ofMouseEventArgs & args);
+		void outputMouseReleased(ofMouseEventArgs & args);
+		void outputWindowResized(ofResizeEventArgs &resizeargs);	
 
 		bool commandPressed;
 
-
 		glm::vec2 warpframe[4];
 		int select_warpframe;
 		bool bDrawFrame;
 
+		ofxPanel gui;
+
+		//======================================== //ofxNDI
+
+		ofxNDIreceiver ndiReceiver;
+		ofImage ndiImage;
+		char senderName[256];
+		int nSenders;
+		unsigned int senderWidth;
+		unsigned int senderHeight;
+		bool bNDIreceiver;
+
+		// For received frame fps calculations
+		double startTime, lastTime, frameTime, frameRate, fps;
+
+		//====== gui
+
+		ofxIntSlider NDIthreshold;
+		ofxIntSlider NDIsimplify;
+		ofxToggle	 NDIuseColour;
+		ofxIntSlider NDIcolR;
+		ofxIntSlider NDIcolG;
+		ofxIntSlider NDIcolB;
+
 };