levels working, lyrics loading

1 files changed, 13 insertions, 10 deletions

diff --git a/vfg/src/testApp.cpp b/vfg/src/testApp.cpp
index c0c3671..dc450a2 100755
--- a/vfg/src/testApp.cpp
+++ b/vfg/src/testApp.cpp
@@ -2,10 +2,14 @@
 
 //--------------------------------------------------------------
 void testApp::setup(){
-	testsong=new song("VODA_MUS_DeckTheHalls-Backing_v.1.3.mp3","VODA_MUS_DeckTheHalls-Melody_v.1.3.mp3","MIDI_DeckTheHalls_Test.1.3.xml");
-	testsong->setTimeframe(10000);
-	testsong->preRoll(250);
 	
+	//for (float i=0;i<1.2;i+=0.1) printf("%f in level %i bound %f\n",i,lives->getLevel(i),lives->getLowerBound(lives->getLevel(i)));
+	
+	testsong=new song("VODA_MUS_DeckTheHalls-Backing_v.1.5.mp3","VODA_MUS_DeckTheHalls-Melody_v.1.5.mp3","MIDI_DeckTheHalls_MIDI.1.5.xml","Lyrics_DeckTheHalls.1.5.xml","Levels_DeckTheHalls.1.5.xml");
+	testsong->setTimeframe(2500);
+	testsong->setFlakeThresh(1000,100);
+	testsong->preRoll(250);
+
 	ofSetBackgroundAuto(false);
 	ofBackground(0,0,0);
 }
@@ -20,15 +24,14 @@ void testApp::update(){
 
 //--------------------------------------------------------------
 void testApp::draw(){
-	ofEnableAlphaBlending(); 
+	ofEnableAlphaBlending();
 	//ofBackground(0,0,0,0.1);
-	ofSetColor(0,0,0,100);
+	ofSetColor(0,0,0,50);
 	ofRect(0,0,ofGetWidth(),ofGetHeight());
-	if (testsong->isPlaying) testsong->draw();
-	else {
-		ofSetColor(255,255,255);
-		ofDrawBitmapString("game over!", (ofGetWidth()/2)-25,(ofGetHeight()/2)-5);
-	}
+	ofSetColor(255,255,255);
+	testsong->draw();
+	if (!testsong->isPlaying) ofDrawBitmapString("game over!", (ofGetWidth()/2)-25,(ofGetHeight()/2)-5);
+
 }
 
 //--------------------------------------------------------------