1 files changed, 37 insertions, 28 deletions

diff --git a/vfg/src/testApp.cpp b/vfg/src/testApp.cpp
index 5324b23..fa8b9aa 100755
--- a/vfg/src/testApp.cpp
+++ b/vfg/src/testApp.cpp
@@ -28,41 +28,41 @@ void testApp::setup(){
 	songs.push_back(new song("DeckTheHalls_v.4.0/VODA_MUS_DeckTheHalls-Backing_v.4.0.mp3","DeckTheHalls_v.4.0/VODA_MUS_DeckTheHalls-Lead_v.4.0.mp3","VODA_MIDI_DeckTheHalls-v.4.0.xml","Lyrics_DeckTheHalls.4.0.xml","Levels_DeckTheHalls.4.0.xml"));
 	songs.push_back(new song("DingDong.v.2.2/VODA_MUS_DingDong_Backing_v.2.2.mp3","DingDong.v.2.2/VODA_MUS_DingDong_Melody_v.2.2.mp3","VODA_MIDI_DingDong_v.2.2.xml","Lyrics_DingDong.2.2.xml","Levels_DingDong.2.2.xml"));
 	songs.push_back(new song("JingleBells_v.4.0/VODA_MUS_JingleBells_Backing_v.4.0.mp3","JingleBells_v.4.0/VODA_MUS_JingleBells_Melody_v.4.0.mp3","VODA_MUS_JingleBells_MIDI_v.4.0.xml","Lyrics_JingleBells.4.0.xml","Levels_JingleBells.4.0.xml"));
-	
+
 	ofSetBackgroundAuto(false);
 	ofBackground(0,0,0);
-	
+
 	//printf("we wish you a merry xmas:\n");
 	//songs[0]->notes.printNotes();
-	
+
 	for (int i=0;i<3;i++) penguins.push_back(Animal());
 	penguins[0].load("Penguin-Blue.xml");
 	penguins[1].load("Penguin-Purple.xml");
 	penguins[2].load("Penguin-Green.xml");
 
-	/* temp save time
+	// temp save time
 	for (int i=0;i<3;i++) raccoons.push_back(Animal());
 	raccoons[0].load("Raccoon-Blue.xml");
 	raccoons[1].load("Raccoon-Purple.xml");
 	raccoons[2].load("Raccoon-Green.xml");
-	*/
-	
+
+
 	tags.push_back(new Tag("Tags/TAG_Get-Ready.png",2000,0.5,0));
 	tags.push_back(new Tag("Tags/TAG_Level-1.png",3000,0.5,0));
 	tags.push_back(new Tag("Tags/TAG_Level-2.png",3000,0.5,0));
 	tags.push_back(new Tag("Tags/TAG_Level-3.png",3000,0.5,0));
 	tags.push_back(new Tag("Tags/TAG_Level-4.png",3000,0.5,0));
-	
+
 	logos.push_back(new Billboard("Logo-VF.png",0.5,0.0));
 	logos.push_back(new Billboard("Logo-DCC.png",0.36,0.855));
-	
+
 	lyricspanel=new Billboard("Lyrics-panel.png",0.5,0.703);
-	
+
 	banner.load("Ribbon/Dublin/Ribbon_%05i.png",500);
 	banner.setAnchorPercent(0.5,0.0);
 	banner.setFrameRate(50);
 	banner.play();
-	
+
 	//loadanimals("Raccoons");
 	playanimal =&penguins;
 
@@ -72,10 +72,10 @@ void testApp::setup(){
 
 	//release: commented out: 	436m 256m
 	//508fr 1.4s load   in use:	836m 443m
-	
+
 	intro.loadMovie("Game-Demo_v3.mp4");
 	intro.setLoopState(OF_LOOP_NONE);
-	
+
 	advert.loadMovie("GW2003761_GRY-VFBR055-060_MPEG_hi.mpg");
 	advert.setLoopState(OF_LOOP_NONE);
 
@@ -92,11 +92,11 @@ void testApp::setup(){
 	currentsong=0;
 	nextsong=0;
 	gamestate=GAME_READY;
-	
-	
+
+
 	guiWin=new guiWindow();
 	gui.setup("","panel.xml",0,0);
-	
+
 	threshStart=2000;
 	gui.add(tS.setup("start threshold",threshStart,0,4000,255));
 	threshEnd=500;
@@ -105,21 +105,21 @@ void testApp::setup(){
 	gui.add(ts.setup("timescale",timescale,0,10000,255));
 	keyThresh=1500;
 	gui.add(kT.setup("keythresh",keyThresh,0,4000,255));
-	
+
 	ofxFenster* win=ofxFensterManager::get()->createFenster(0, 0,  200, 400, OF_WINDOW);
 	win->setWindowTitle("config");
 	win->addListener(guiWin);
 	ofAddListener(win->events.keyPressed, this, &testApp::keyPressedEvent);
 	guiWin->setup();
 	guiWin->setParent(this);
-	
+
 }
 /*
 void testApp::loadanimals(string which) {
 	playanimals.clear();
-	
+
 	for (int i=0;i<3;i++) playanimals.push_back(Animal());
-	
+
 	if (which=="Penguins") {
 		playanimals[0].load("Penguin-Blue.xml");
 		playanimals[1].load("Penguin-Purple.xml");
@@ -130,7 +130,7 @@ void testApp::loadanimals(string which) {
 		playanimals[1].load("Raccoon-Purple.xml");
 		playanimals[2].load("Raccoon-Green.xml");
 	}
-	
+
 }
 */
 
@@ -147,7 +147,7 @@ void testApp::update(){
 		songs[currentsong]->setTimeframe(timescale);
 		songs[currentsong]->setFlakeThresh(threshStart,threshEnd);
 		songs[currentsong]->setKeyThresh(keyThresh);
-		songs[currentsong]->preRoll(750);
+		songs[currentsong]->preRoll(5000);
 		tags[0]->play();
 		nextsong=(nextsong+1)%songs.size();
 		gamestate=GAME_PLAYING;
@@ -170,10 +170,19 @@ void testApp::update(){
 	for (int i=0;i<3;i++) {
 		(*playanimal)[i].update();
 	}
-	background.update();
-	banner.update();
-	intro.update();
-	advert.update();
+	switch(gamestate) {
+		case GAME_READY:
+		case GAME_PLAYING:
+            background.update();
+            banner.update();
+            break;
+        case GAME_INTRO:
+            intro.update();
+            break;
+        case GAME_ADVERT:
+            advert.update();
+            break;
+	}
 }
 
 //--------------------------------------------------------------
@@ -251,11 +260,11 @@ void testApp::draw(){
 }
 //--------------------------------------------------------------
 void testApp::keyPressedEvent(ofKeyEventArgs &args) {
-	printf("window key pressed: %i (%c)\n",args.key,args.key);
+	//printf("window key pressed: %i (%c)\n",args.key,args.key);
 	keyPressed(args.key);
 }
 void testApp::keyPressed(int key, ofxFenster* win){
-	printf("window sent %i\n",key);
+	//printf("window sent %i\n",key);
 	if(key == '='){
 			fullscreenoutput=!fullscreenoutput;
 			win->setFullscreen(fullscreenoutput);
@@ -273,7 +282,7 @@ void testApp::keyPressed(int key){
 				songs[currentsong]->setTimeframe(timescale);
 				songs[currentsong]->setFlakeThresh(threshStart,threshEnd);
 				songs[currentsong]->setKeyThresh(keyThresh);
-				songs[currentsong]->preRoll(750);
+				songs[currentsong]->preRoll(5000);
 				tags[0]->play();
 				nextsong=(nextsong+1)%songs.size();
 			}