folded kinect into main branch

1 files changed, 15 insertions, 2 deletions

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 689fb18..fa04e0b 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -2,7 +2,6 @@
 
 //#include <GL/glxew.h>
 
-
 #include "ofMain.h"
 #include "ofxXmlSettings.h"
 
@@ -127,6 +126,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void keyPressedEvent(ofKeyEventArgs &args);
 		void windowEvent(ofResizeEventArgs &args);
 
+		void nmidiMessage(int event,int data1, int data2);
+
 		void makeColours();
 
 		void toggleFPS();
@@ -144,7 +145,6 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		bool fullscreenoutput;
 
 		float lastnoteTime;
-		float decayTime;
 
 		int fadetime;
 		int rotate;
@@ -182,9 +182,22 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		ofxToggle transparentBlack;
 		ofxButton resetDrawscale;
 		ofxButton resetFBscale;
+		ofxIntSlider fS;
+		ofxParameter<int> fadeScale;
+		ofxFloatSlider dT;
+		ofxParameter<float> decayTime;
+		ofxToggle oscScale;
+		ofxToggle breakOsc;
+		ofxToggle randomOsc;
+		ofxFloatSlider sA;
+		ofxParameter<float> scaleAmplitude;
+		ofxFloatSlider sF;
+		ofxParameter<float> scaleFrequency;
 		ofxToggle drawCloud;
 		ofxToggle drawSkel;
 
+		float randOffs;
+
 		void resetDrawscalePressed(bool & pressed);
 		void resetFBscalePressed(bool & pressed);