starting to build kinect addition

1 files changed, 30 insertions, 1 deletions

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index a03ad4b..e0a00cc 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -2,6 +2,7 @@
 
 //#include <GL/glxew.h>
 
+#include "ofxOpenNI.h"
 #include "ofMain.h"
 #include "ofxXmlSettings.h"
 
@@ -94,6 +95,7 @@ enum PropertyAttribute {
 
 class previewWindow;
 class guiWindow;
+class kinectWindow;
 
 //#define GRAB_TEXTURE
 
@@ -117,9 +119,9 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void dragEvent(ofDragInfo dragInfo);
 		void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 
-		void refDragEvent(ofDragInfo &args);
 		void mousePressedEvent(ofMouseEventArgs &args);
 		void keyPressedEvent(ofKeyEventArgs &args);
+		void windowEvent(ofResizeEventArgs &args);
 
 		void makeColours();
 
@@ -151,9 +153,11 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		float colShift;
 
 		viewport vp1,vp2;
+		vector<viewport*> viewports;
 
 		previewWindow *prevWin;
 		guiWindow *guiWin;
+		kinectWindow *kinectWin;
 
 		ofxFenster* win;
 
@@ -164,6 +168,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void newMidiMessage(ofxMidiEventArgs& eventArgs);
 
 		playlist list;
+		
 
 		ofxPanel gui;
 		ofxToggle reversemain;
@@ -175,10 +180,33 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 
 		void resetDrawscalePressed(bool & pressed);
 		void resetFBscalePressed(bool & pressed);
+		
+		//kinect stuff
+		
+		bool useKinect;
+		
+		bool	isLive, isTracking, isMasking, isFiltering, isCloud;
+	
+		ofxOpenNIContext	recordContext;
+		ofxDepthGenerator	recordDepth;
+		ofxImageGenerator	recordImage;
+		ofxUserGenerator		recordUser;
+		
+		int				nearThreshold, farThreshold;
+		float				filterFactor;
 
 
 };
 
+class kinectWindow: public ofxFensterListener{
+public:
+	~kinectWindow();
+	testApp *parent;
+	void setup();
+	void setParent(testApp *p);
+	void draw();
+};
+
 
 class previewWindow: public ofxFensterListener{
 public:
@@ -197,6 +225,7 @@ public:
 	void setParent(testApp *p);
 	void draw();
 	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
+	void windowMoved(int x, int y);
 };