From ba7cc94d4ae55e171f0e08126abb0cb13d8f9f8f Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Fri, 31 Aug 2012 09:21:00 +0100
Subject: blocking loading playlists

---
 liveengine/src/testApp.h | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'liveengine/src/testApp.h')

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 0ad4dc3..7e0272f 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -41,7 +41,21 @@ initially - divide screen into grid - play notes with fade
 class that loads an svg and maps controllers to layers
 layers are there but maybe its best to draw all of the colours mapped in some way rather than cutting out layers - colour transformation based on a hue angle
 
-can draw
+
+fix feedback - direction etc
+all drawn/ scaled from middle
+colours for svgs
+multi screen
+loader/ programme changer - seperate xml for main programme and for each content section
+script engine for scaling
+more specific colour filtering for photos
+auto masks based on colour
+
+wrap around/ scale textures
+
+3d blocks
+non random colours
+
 
 */
 
@@ -60,6 +74,9 @@ can draw
 
 #include "layers.h"
 
+#define BLOCKS 0
+#define LIST 1
+
 
 
 
@@ -84,13 +101,21 @@ class testApp : public ofBaseApp, public ofxMidiListener{
 		void toggleFPS();
 		bool showFPS;
 
+		void loadplaylist(string _name);
+
 		ofxXmlSettings XML;
 
 		unsigned char* controllers;
-		unsigned char note;
+		int note,mode;
+
+		float lastnoteTime;
+		float decayTime;
+
+		int xshift,yshift;
+
 		ofColor* controller_colours;
 
-		ofImage grab;
+		ofTexture grab;
 
 		int midiChannel;
 
@@ -99,5 +124,6 @@ class testApp : public ofBaseApp, public ofxMidiListener{
 		void newMidiMessage(ofxMidiEventArgs& eventArgs);
 
 		map<int,layer*> layers;
+
 };
 
-- 
cgit v1.2.3