diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-06-22 17:10:17 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-06-22 17:10:17 +0100 |
| commit | 8e22cdc4203dc04e7fdfdd607f27c6b2a61f458b (patch) | |
| tree | c9c22ec106d20c6b13d2d184f141a2a3774c9ca1 /gaunt01/src/testApp.cpp | |
| parent | 5606e9f56d1333c32fd711a74f372669948bae8d (diff) | |
usable version
Diffstat (limited to 'gaunt01/src/testApp.cpp')
| -rw-r--r-- | gaunt01/src/testApp.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gaunt01/src/testApp.cpp b/gaunt01/src/testApp.cpp index 6af06ad..6522f91 100644 --- a/gaunt01/src/testApp.cpp +++ b/gaunt01/src/testApp.cpp @@ -712,7 +712,7 @@ void testApp::update(){ } } - if (gameState==PLAYING) Bird.update(players,cam_angle); + if (gameState>EXPLAIN) Bird.update(players,cam_angle); } @@ -833,19 +833,19 @@ void testApp::draw(){ switch(gameState) { case TITLES: billboards[0].draw(windowWidth/6 - ,scaleFactor.y*((-billboards[0].height/2)+(billboards[0].height*pow(sin(segElapsed*PI),0.5))) + ,scaleFactor.y*((-billboards[0].height/2)+(billboards[0].height*pow(sin(segElapsed*PI),0.4))) ,billboards[0].width*scaleFactor.x ,billboards[0].height*scaleFactor.y); break; case CREDIT: billboards[1].draw(windowWidth/6 - ,windowHeight+(scaleFactor.y*((billboards[1].height/2)-(billboards[1].height*pow(sin(segElapsed*PI),0.5)))) + ,windowHeight+(scaleFactor.y*((billboards[1].height/2)-(billboards[1].height*pow(sin(segElapsed*PI),0.4)))) ,billboards[1].width*scaleFactor.x ,billboards[1].height*scaleFactor.y); break; case EXPLAIN: billboards[2].draw(windowWidth/2 - ,scaleFactor.y*((-billboards[2].height/2)+(billboards[2].height*pow(sin(segElapsed*PI),0.5))) + ,scaleFactor.y*((-billboards[2].height/2)+(billboards[2].height*pow(sin(segElapsed*PI),0.4))) ,billboards[2].width*scaleFactor.x ,billboards[2].height*scaleFactor.y); break; @@ -853,7 +853,7 @@ void testApp::draw(){ break; case GOTCHA: billboards[3].draw(windowWidth/2 - ,scaleFactor.y*((-billboards[2].height/2)+(billboards[3].height*pow(sin(segElapsed*PI),0.5))) + ,scaleFactor.y*((-billboards[2].height/2)+(billboards[3].height*pow(sin(segElapsed*PI),0.4))) ,billboards[3].width*scaleFactor.x ,billboards[3].height*scaleFactor.y); break; @@ -928,7 +928,7 @@ void testApp::draw(){ ofPopMatrix(); char numStr[10]; - sprintf(numStr, "%4.1f", Bird.playhead[i]); + sprintf(numStr, "%4.1f", Bird.playdist[i]); ofVec3f sc=cam.worldToScreen(ofVec3f((Bird.position.x+Bird.playpos[i].x)/2,(Bird.position.y+Bird.playpos[i].y)/2,(Bird.position.z+Bird.playpos[i].z)/2).rotated(cam_angle,ofVec3f(1,0,0))); ofDrawBitmapString(numStr, sc.x, sc.y); } |