diff options
| -rwxr-xr-x | vfg/src/testApp.cpp | 11 | ||||
| -rwxr-xr-x | vfg/vfg.cbp | 6 | ||||
| -rw-r--r-- | vfg/vfg.layout | 20 |
3 files changed, 25 insertions, 12 deletions
diff --git a/vfg/src/testApp.cpp b/vfg/src/testApp.cpp index 928604d..427ece9 100755 --- a/vfg/src/testApp.cpp +++ b/vfg/src/testApp.cpp @@ -6,7 +6,8 @@ void testApp::setup(){ //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); ofSetBackgroundAuto(false); ofBackground(0,0,0); @@ -37,8 +38,6 @@ void testApp::exit(){ void testApp::update(){ int ret=game.update(); if (ret==1000) { - testsong->setTimeframe(2500); - testsong->setFlakeThresh(1000,100); testsong->preRoll(250); } else if (ret>0) { @@ -74,8 +73,10 @@ void testApp::draw(){ //-------------------------------------------------------------- void testApp::keyPressed(int key){ switch (key) { - case '0': - if (!testsong->isPlaying) testsong->preRoll(250); + case ' ': + if (!testsong->isPlaying) { + testsong->preRoll(250); + } break; case '1': case '2': diff --git a/vfg/vfg.cbp b/vfg/vfg.cbp index a0edd04..2e01d0a 100755 --- a/vfg/vfg.cbp +++ b/vfg/vfg.cbp @@ -33,6 +33,12 @@ <Unit filename="config.make"> <Option virtualFolder="build config" /> </Unit> + <Unit filename="src/Asterisk.cpp"> + <Option virtualFolder="src/" /> + </Unit> + <Unit filename="src/Asterisk.h"> + <Option virtualFolder="src/" /> + </Unit> <Unit filename="src/main.cpp"> <Option virtualFolder="src/" /> </Unit> diff --git a/vfg/vfg.layout b/vfg/vfg.layout index 5f7fd63..2a632ba 100644 --- a/vfg/vfg.layout +++ b/vfg/vfg.layout @@ -2,21 +2,27 @@ <CodeBlocks_layout_file> <ActiveTarget name="Debug" /> <File name="addons.make" open="1" top="0" tabpos="2"> - <Cursor position="51" topLine="0" /> + <Cursor position="62" topLine="0" /> + </File> + <File name="src/Asterisk.cpp" open="1" top="0" tabpos="3"> + <Cursor position="48" topLine="3" /> + </File> + <File name="src/Asterisk.h" open="1" top="0" tabpos="5"> + <Cursor position="1219" topLine="22" /> </File> <File name="src/main.cpp" open="1" top="0" tabpos="1"> <Cursor position="219" topLine="0" /> </File> - <File name="src/music.cpp" open="1" top="0" tabpos="5"> - <Cursor position="5914" topLine="230" /> + <File name="src/music.cpp" open="1" top="0" tabpos="6"> + <Cursor position="6704" topLine="143" /> </File> - <File name="src/music.h" open="1" top="0" tabpos="6"> + <File name="src/music.h" open="0" top="0" tabpos="6"> <Cursor position="4066" topLine="114" /> </File> <File name="src/testApp.cpp" open="1" top="0" tabpos="4"> - <Cursor position="1300" topLine="8" /> + <Cursor position="2271" topLine="48" /> </File> - <File name="src/testApp.h" open="1" top="1" tabpos="3"> - <Cursor position="1223" topLine="22" /> + <File name="src/testApp.h" open="0" top="0" tabpos="3"> + <Cursor position="1223" topLine="14" /> </File> </CodeBlocks_layout_file> |