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/layers.h | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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

diff --git a/liveengine/src/layers.h b/liveengine/src/layers.h
index e3b0fd8..55f9529 100644
--- a/liveengine/src/layers.h
+++ b/liveengine/src/layers.h
@@ -10,7 +10,7 @@ class layer
 		layer(string _f);
 		virtual ~layer();
 		virtual void load(string _f);
-		virtual void draw();
+		virtual void draw(float a);
 	protected:
 	private:
 };
@@ -22,10 +22,24 @@ class svglayer: public layer
 		svglayer(string _f);
 		virtual ~svglayer();
 		void load(string _f);
-		void draw();
+		void draw(float a);
 	protected:
 	private:
-		ofxSVGTiny svg;
+		ofxSVGTiny svg;
+		vector <ofColor> fills;
+		vector <ofColor> strokes;
 };
 
+class imglayer: public layer
+{
+	public:
+		imglayer();
+		imglayer(string _f);
+		virtual ~imglayer();
+		void load(string _f);
+		void draw(float a);
+	protected:
+	private:
+		ofImage img;
+};
 #endif // SVGLAYER_H
-- 
cgit v1.2.3