character transitions

1 files changed, 9 insertions, 6 deletions

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index d4a9627..0cc0942 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -8,7 +8,6 @@
 #include "music.h"
 #include "Asterisk.h"
 #include "Puppet.h"
-#include "Animal.h"
 #include "Tag.h";
 
 /*
@@ -48,6 +47,7 @@ ramdisk for movies
 #define GAME_PRACTICE 9
 #define GAME_PLAYING 10
 #define GAME_ENDPLAYING 11
+#define GAME_WALKON 12
 
 class guiWindow;
 
@@ -76,6 +76,7 @@ class testApp : public ofxFensterListener{
 		void activateGame();
 		void activatePractice();
 		void switchAnimals();
+		void endGame();
 
 		ofVideoPlayer intro;
 		ofVideoPlayer advert;
@@ -88,14 +89,14 @@ class testApp : public ofxFensterListener{
 		song practiceSong;
 
 
-		vector<Animal> penguins;
-		vector<Animal> raccoons;
+		vector<Puppet> penguins;
+		vector<Puppet> raccoons;
 
-		//vector<vector<Animal> > animals;
+		//vector<vector<Puppet> > animals;
 
-		//vector<Animal> playanimals;
+		//vector<Puppet> playanimals;
 
-		vector<Animal>* playanimal;
+		vector<Puppet>* playanimal;
 		vector<Tag*> tags;
 
 		vector<Billboard*> logos;
@@ -128,6 +129,8 @@ class testApp : public ofxFensterListener{
 		ofxParameter<int> timescale;
 		ofxIntSlider kT;
 		ofxParameter<int> keyThresh;
+		ofxFloatSlider bP;
+		ofxParameter<float> birdpoint;
 		ofxToggle showWire;
 
 };