From a0ab2cd35d91ba0080f9fb870d82aa90a51a0d6c Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 28 Nov 2012 18:40:32 +0000
Subject: nearly finished except latency

---
 vfg/src/testApp.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index 2518b55..143885c 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -7,6 +7,7 @@
 #include "Asterisk.h"
 #include "Puppet.h"
 #include "Animal.h"
+#include "Tag.h";
 
 /*
 this library?
@@ -78,16 +79,24 @@ class testApp : public ofBaseApp{
 		ofVideoPlayer background;
 		ofImage vignette;
 
-		song *testsong;
+		vector<song*> songs;
 
 	
 		vector<Animal> penguins;
 		vector<Animal> raccoons;
 		
+		vector<vector<Animal> > animals;
 		
 		//vector<Animal> playanimals;
 
 		vector<Animal>* playanimal;
+		vector<Tag*> tags;
+		
+		vector<Billboard*> logos;
+		
+		puppetSprite banner;
+		
+		Billboard* lyricspanel;
 
 		Puppet testpenguin;
 		int currentlevel;
@@ -95,6 +104,8 @@ class testApp : public ofBaseApp{
 		Asterisk game;
 
 		bool showFPS;
+		
+		int currentsong,nextsong;
 
 };
 
-- 
cgit v1.2.3