DjalimSimaila/SuperSpaceInvaderTurboApocalypseVsGOD
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Thomas776/SAE102-SpaceInvaders

Browse Source
This commit is contained in:
Djalim Simaila 2022-01-10 17:03:17 +01:00
commit 3553f59640
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/game/gameBasics.cpp
View File

@ -122,10 +122,7 @@ WinValue Game::enterGameLoop(){ // returns when game is finished
typedef chrono::high_resolution_clock::time_point MyTimePoint;
MyTimePoint fpsStartTime = {};
DEBUG_INSTR(MyTimePoint debugTime);
while(window.isOpen()){
DEBUG_INSTR(fflush(stdout));
DEBUG_MSG("------------")
MyTimePoint startTime = chrono::high_resolution_clock::now();
if(fpsStartTime.time_since_epoch()==chrono::seconds(0)){
@ -134,38 +131,26 @@ WinValue Game::enterGameLoop(){ // returns when game is finished
pm->startFrame();
START_TIMER()
managePlayers();
PRINT_TIMER("manage players")
START_TIMER()
if(manageInvaders()) { // if they went down
if (invadersTouchPlayer())return WinValue::INVADERS;
tryAwakeGod();
}
PRINT_TIMER("manage invaders")
START_TIMER()
if(manageGod())return WinValue::PLAYERS;
if(arePlayersDead())return WinValue::GOD;
PRINT_TIMER("god")
START_TIMER()
moveMissiles();
remCollidingProjectiles();
moveTorpedos();
remCollidingProjectiles();
PRINT_TIMER("self collisions")
START_TIMER()
checkMissilesAndPlayers();
if(checkTorpedosAndInvaders())return WinValue::PLAYERS;
PRINT_TIMER("collisions between entities")
if(arePlayersDead())return WinValue::INVADERS;
START_TIMER()
displayAll(fps);
PRINT_TIMER("display")
pm->endFrame();