1 files changed, 46 insertions, 6 deletions

diff --git a/src/testApp.h b/src/testApp.h
index f99df9f..78ed5eb 100755
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -13,13 +13,13 @@
 #include "ofxMidi.h"
 #include "ofxFensterManager.h"
 
+
+
 #include "ofxGui.h"
 
 
 #include "viewport.h"
 
-#include "ofxKinect.h"
-
 
 
 class previewWindow;
@@ -27,6 +27,8 @@ class guiWindow;
 class kinectWindow;
 
 
+
+
 class testApp : public ofxFensterListener, public ofxMidiListener{
 
 	public:
@@ -81,6 +83,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 
 
 		ofxPanel gui;
+		/*
 		ofxToggle reversemain;
 		ofxToggle controlColours;
 		ofxToggle noteRandomiseColours;
@@ -88,17 +91,45 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		ofxButton resetDrawscale;
 		ofxButton resetFBscale;
 		ofxToggle drawCloud;
+		*/
 		
 		ofxIntSlider fadectl;
 		ofxParameter<int> fade;
-		ofxIntSlider decimatectl;
-		ofxParameter<int> decimate;
-
+		ofxFloatSlider decimatectl;
+		ofxParameter<float> decimate;
+		ofxFloatSlider featurectl;
+		ofxParameter<float> featuresize;
+		
+		//a radio button. sigh.
+		int drawMode;
+		ofxToggle pointsMode;
+		ofxToggle linesMode;
+		ofxToggle polysMode;
+		void pointsModeSet(bool & set);
+		void linesModeSet(bool & set);
+		void polysModeSet(bool & set);
+		
+		ofxToggle logo;
+		//void logoSet(bool & set);
+		
+		ofxFloatSlider rangectl;
+		ofxParameter<float> range;
+		
+		ofxFloatSlider xrotctl;
+		ofxParameter<float> xrot;
+		ofxFloatSlider yrotctl;
+		ofxParameter<float> yrot;
+		ofxFloatSlider zrotctl;
+		ofxParameter<float> zrot;
+		
+		ofxButton resetDrawscale;
+		ofxButton resetFBscale;
+		ofxButton resetSlide;
 
 		void resetDrawscalePressed(bool & pressed);
 		void resetFBscalePressed(bool & pressed);
+		void resetSlidePressed(bool & pressed);
 		
-		void fadeSet(int amt);
 
 
 		//kinect stuff
@@ -136,6 +167,15 @@ public:
 	void setup();
 	void setParent(testApp *p);
 	void draw();
+	void mouseMoved(int x, int y, ofxFenster* f) {};
+	void mouseMoved(int x, int y) {};
+	void mouseDragged(int x, int y, int button,  ofxFenster* f) {};
+	void mouseDragged(int x, int y, int button) {};
+	void mousePressed(int x, int y, int btn, ofxFenster* f) {};
+	void mousePressed(int x, int y, int btn) {};
+	void mouseReleased(int x, int y, int btn, ofxFenster* f) {};
+	void mouseReleased(int x, int y, int btn) {};
+	void mouseReleased() {};
 	void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 	void windowMoved(int x, int y);
 };