1 files changed, 15 insertions, 11 deletions

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 9104ac6..a556038 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -56,6 +56,8 @@ wrap around/ scale textures
 3d blocks
 non random colours
 
+option to randomise colours on each note
+
 
 */
 
@@ -79,17 +81,14 @@ non random colours
 
 class previewWindow: public ofxFensterListener{
 public:
-	~previewWindow(){
-		cout << "preview window destroyed" << endl;
-	}
-	void setup(){
-	}
-	void draw(ofTexture &grab){
-		grab.draw(0,0,ofGetWidth(),ofGetHeight());
-	}
-
+	~previewWindow();
+	ofFbo *rb;
+	void setup();
+	void setBuffer(ofFbo *buffer);
+	void draw();	
 };
 
+//#define GRAB_TEXTURE
 
 class testApp : public ofxFensterListener, public ofxMidiListener{
 
@@ -99,6 +98,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void update();
 		void draw();
 
+		void keyPressed(int key, ofxFenster* win);
 		void keyPressed(int key);
 		void keyReleased(int key);
 		void mouseMoved(int x, int y );
@@ -109,6 +109,9 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
 
+		void mouseMovedEvent(ofMouseEventArgs &args); 
+		void keyPressedEvent(ofKeyEventArgs &args); 
+
 		void makeColours();
 
 		void toggleFPS();
@@ -119,7 +122,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		unsigned char* controllers;
 		int note, mode;
 
-		bool controlColours;
+		bool debug, controlColours;
+		bool noteRandomiseColours;
 
 		float lastnoteTime;
 		float decayTime;
@@ -132,7 +136,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 
 		ofColor* controller_colours;
 
-		ofTexture grab;
+		ofFbo rb1,rb2;
 
 		previewWindow prevWin;