diff options
Diffstat (limited to 'vfg/src/testApp.cpp')
| -rwxr-xr-x | vfg/src/testApp.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vfg/src/testApp.cpp b/vfg/src/testApp.cpp index cd7572c..6d2155c 100755 --- a/vfg/src/testApp.cpp +++ b/vfg/src/testApp.cpp @@ -157,6 +157,7 @@ void testApp::setup(){ birdpoint=0.6; gui.add(bP.setup("wire level",birdpoint,0.5,0.7,255)); gui.add(showWire.setup("wire",true)); + gui.add(showLyrics.setup("lyrics",true)); ofxFenster* win=ofxFensterManager::get()->createFenster(0, 0, 200, 400, OF_WINDOW); win->setWindowTitle("config"); @@ -368,7 +369,7 @@ void testApp::draw(){ } } aspect=advert.getHeight()/advert.getWidth(); - float maxwidth=ofGetWidth(); //min((float)ofGetWidth(),ofGetHeight()*1.2f); + float maxwidth=ofGetHeight(); //min((float)ofGetWidth(),ofGetHeight()*1.2f); float wstart=(ofGetWidth()-maxwidth)*0.5; wOffs=(ofGetHeight()-(maxwidth*aspect))*0.5; advert.draw(wstart,wOffs,maxwidth,maxwidth*aspect); @@ -427,8 +428,8 @@ void testApp::draw(){ hit=songs[currentsong]->hitNote(); if (hit>-1) (*playanimal)[hit].play("Catch"); for (int i=0;i<3;i++) (*playanimal)[i].draw(hOffs+(gridX[i+1]*ofGetHeight()),gridY[0]*ofGetHeight(),scale); - lyricspanel->draw(ofGetWidth()*0.5,ofGetHeight()*gridY[1],scale); - songs[currentsong]->draw(hOffs,scale); + if (showLyrics) lyricspanel->draw(ofGetWidth()*0.5,ofGetHeight()*gridY[1],scale); + songs[currentsong]->draw(hOffs,scale,showLyrics); break; case GAME_ENDPLAYING: //6 seconds to walk in / out -> 12 seconds turnaround @@ -689,8 +690,8 @@ void testApp::queueWalkOn(){ numcycles=7; } else { - start=200; //of 780 was 400 - numcycles=5; + start=500; //of 780 was 400 + numcycles=6; } (*playanimal)[i].play("Walking",ofGetElapsedTimeMillis()+start); for (int j=0;j<numcycles;j++) (*playanimal)[i].play("Walking"); |