1 files changed, 18 insertions, 28 deletions

diff --git a/vfg/src/testApp.h b/vfg/src/testApp.h
index 4890724..c287fb1 100755
--- a/vfg/src/testApp.h
+++ b/vfg/src/testApp.h
@@ -30,36 +30,24 @@ Maximilian is an audio synthesis and signal processing library written in C++. I
 - realtime music information retrieval functions: spectrum analysis, spectral features, octave analysis, and MFCCs
 - example projects for Windows and MacOS, using command line and OpenFrameworks environments
 
-
-
-game design demo
-
-state - game started, game over
-
-while playing - game full volume - if you miss a flake - starts countdown - game gets quieter and stars get fainter - when countdown is down 'game over'
-
-keys - volume - control drawing of stars - game state
-
-
-changes 05112012
-
-event suppression working?
-overlap
-
-
-character class- load sprites from xml- play behaviours- block animations when others are playing
-
-//hooking up the backend
-1 - start game - sends message - starts if acknowledged
-2 - receive dtmf
-3 - hang up
+transitions
+break clap movements
+practice mode
+ramdisk for movies
 
 */
 
-#define GAME_INTRO 1
-#define GAME_READY 2
-#define GAME_ADVERT 3
-#define GAME_PLAYING 4
+#define GAME_STARTINGINTRO 1
+#define GAME_INTRO 2
+#define GAME_ENDINGINTRO 3
+#define GAME_READY 4
+#define GAME_STARTINGADVERT 5
+#define GAME_ADVERT 6
+#define GAME_ENDINGADVERT 7
+#define GAME_STARTPLAYING 8
+#define GAME_PRACTICE 9
+#define GAME_PLAYING 10
+#define GAME_ENDPLAYING 11
 
 class guiWindow;
 
@@ -83,6 +71,8 @@ class testApp : public ofxFensterListener{
 		void windowResized(int w, int h);
 		void dragEvent(ofDragInfo dragInfo);
 		void gotMessage(ofMessage msg);
+		
+		void drawBackgroundLayers();
 	
 		ofVideoPlayer intro;
 		ofVideoPlayer advert;
@@ -118,7 +108,7 @@ class testApp : public ofxFensterListener{
 		bool showVis;
 		bool fullscreenoutput;
 		
-		int currentsong,nextsong,gamestate;
+		int currentsong,nextsong,gamestate,segmentStartTime,fadelength;
 		
 		guiWindow *guiWin;
 		ofxPanel gui;