Skip to content

Commit

Permalink
Merge pull request #160 from MyEpitech/startingGameCountDown/victor
Browse files Browse the repository at this point in the history
feat(startGameCountDown): added the starting game countdown, need to …
  • Loading branch information
victorpalle authored Jun 19, 2022
2 parents 11abadc + adbc9f5 commit 6167e09
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 12 additions & 2 deletions project/Source/Scenes/GameScenes/GameScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Scene::GameScene::GameScene(std::shared_ptr<Settings> settings, std::shared_ptr<
_backgroundImage = loadObjects<Object::Image>("Conf/Scenes/GameScene/background.json");
_images = loadObjects<Object::Image>("Conf/Scenes/GameScene/image.json");
_texts = loadObjects<Object::Text>("Conf/Scenes/GameScene/text.json");
_startingGameTexts = loadObjects<Object::Text>("Conf/Scenes/GameScene/startingGameText.json");
_buttons = loadObjects<Object::Button>("Conf/Scenes/GameScene/button.json");
_playerParameters = loadObjects<Object::Text>("Conf/Scenes/GameScene/parameters.json");
_buttons.at(0)->setCallBack(std::bind(&Scene::GameScene::changeCameraView, this));
Expand Down Expand Up @@ -108,6 +109,7 @@ void Scene::GameScene::loadSceneAssets()
void Scene::GameScene::restartSet()
{
_playerSkin = _gameSettings->getPlayerSkins();
_startingGameTexts.at(0)->setText("3");
std::vector<Position> playerPositions;

_ai.clear();
Expand Down Expand Up @@ -169,6 +171,15 @@ void Scene::GameScene::handleCinematicCamera()
_cinematicCamera = false;
resumeGame();
}
std::cout << timer << std::endl;
if (timer > 500 && timer < 1000)
_startingGameTexts.at(0)->setText("2");
if (timer > 1001)
_startingGameTexts.at(0)->setText("1");
if (timer > 1500) {
_startingGameTexts.at(0)->setPosition(Position(820, 500, 0));
_startingGameTexts.at(0)->setText("GO !!");
}
}

void Scene::GameScene::handleBonusParameters()
Expand Down Expand Up @@ -223,8 +234,7 @@ void Scene::GameScene::draw()
}
drawObjects();
_settings->getCamera()->endMode3D();
if (!_cinematicCamera)
drawUserInterface();
_cinematicCamera ? _startingGameTexts.at(0)->draw() : drawUserInterface();
}

void Scene::GameScene::handleWin()
Expand Down
2 changes: 2 additions & 0 deletions project/Source/Scenes/GameScenes/GameScene.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ namespace Scene {
std::vector<std::unique_ptr<Object::Text>> _playerParameters; //!< Vector of player with their writed parameters
float _playerSpeed; //!< Player speed

std::vector<std::unique_ptr<Object::Text>> _startingGameTexts;

std::vector<std::unique_ptr<Object::Bomb>> _bombs; //!< Vector of bombs
float _timeBeforeBombExplosion; //!< Time before bomb explosion

Expand Down

0 comments on commit 6167e09

Please sign in to comment.