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.cpp | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

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

diff --git a/liveengine/src/layers.cpp b/liveengine/src/layers.cpp
index dbf6ccd..f140073 100644
--- a/liveengine/src/layers.cpp
+++ b/liveengine/src/layers.cpp
@@ -9,7 +9,7 @@ layer::layer(string _f)
 void layer::load(string _f){
 }
 
-void layer::draw() {
+void layer::draw(float a) {
 
 }
 
@@ -28,16 +28,42 @@ svglayer::svglayer(string _f)
 void svglayer::load(string _f){
 	svg.load(_f);
 	printf("%i paths\n",svg.getNumPath());
-	for (int i=0;i<svg.getNumPath();i++) {
+	for (int i=0;i<svg.getNumPath();i++) {
+       fills.push_back(svg.getPathAt(i).getFillColor());
+       strokes.push_back(svg.getPathAt(i).getStrokeColor());
 	   printf("	path %i: fill %08x stroke %08x\n",i,svg.getPathAt(i).getFillColor().getHex(),svg.getPathAt(i).getStrokeColor().getHex());
 	}
 }
 
-void svglayer::draw() {
-	svg.draw();
+void svglayer::draw(float a) {
+	//svg.draw();
+	for (int i=0;i<svg.getNumPath();i++) {
+	    svg.getPathAt(i).setFillColor(fills[i]*a);
+	    svg.getPathAt(i).draw();
+	}
 }
 
 svglayer::~svglayer()
 {
     //dtor
 }
+
+imglayer::imglayer() {}
+imglayer::imglayer(string _f)
+{
+	load(_f);
+}
+
+void imglayer::load(string _f){
+	bool success=img.loadImage(_f);
+	printf("%s\n",success?"loaded":"not loaded");
+}
+
+void imglayer::draw(float a) {
+	img.draw(0,0,ofGetWidth(),ofGetHeight());
+}
+
+imglayer::~imglayer()
+{
+    //dtor
+}
-- 
cgit v1.2.3