From 62561162522030bcdba84ac411c5b0a7401509fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Tue, 15 Jun 2021 17:31:50 +0200 Subject: [PATCH] pr comments fixs --- sources/Runner/GameScene.cpp | 2 +- sources/Runner/ScoreScene.cpp | 72 +++++++++---------- .../EndCondition/EndConditionSystem.cpp | 11 +-- 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/sources/Runner/GameScene.cpp b/sources/Runner/GameScene.cpp index dc6caeae..c46bed30 100644 --- a/sources/Runner/GameScene.cpp +++ b/sources/Runner/GameScene.cpp @@ -37,7 +37,7 @@ namespace BBM .addComponent(8, 20, 7) .addComponent(Vector3f(8, 0, 8)); scene->addEntity("Timer") - .addComponent(std::chrono::seconds(60), [](WAL::Entity &, WAL::Wal &) { + .addComponent(std::chrono::minutes (3), [](WAL::Entity &, WAL::Wal &) { Runner::gameState.nextScene = GameState::ScoreScene; }); MapGenerator::loadMap(16, 16, MapGenerator::createMap(16, 16), scene); diff --git a/sources/Runner/ScoreScene.cpp b/sources/Runner/ScoreScene.cpp index a80f3caf..76a3008f 100644 --- a/sources/Runner/ScoreScene.cpp +++ b/sources/Runner/ScoreScene.cpp @@ -20,33 +20,33 @@ namespace BBM { std::shared_ptr Runner::loadScoreScene(WAL::Scene &gameScene) { - auto scene = std::make_shared(); - std::vector playersIconPath; - std::vector>players; + auto scene = std::make_shared(); + std::vector playersIconPath; + std::vector> players; static const std::map sounds = { {SoundComponent::JUMP, "assets/sounds/click.ogg"} }; - static const std::vector tilesColor = { - GOLD, GRAY, BROWN, PURPLE - }; - static const std::vector rankName = { - "1st", "2nd", "3rd", "4th" - }; + static const std::vector tilesColor = { + GOLD, GRAY, BROWN, PURPLE + }; + static const std::vector rankName = { + "1st", "2nd", "3rd", "4th" + }; - for (auto &[entity, score, drawable]: gameScene.view()) - players.push_back(entity); - std::sort(players.begin(), players.end(), [](WAL::Entity &entityA, WAL::Entity &entityB) { - return entityA.getComponent().aliveTime > entityB.getComponent().aliveTime; - }); + for (auto &[entity, score, drawable]: gameScene.view()) + players.push_back(entity); + std::sort(players.begin(), players.end(), [](WAL::Entity &entityA, WAL::Entity &entityB) { + return entityA.getComponent().aliveTime > entityB.getComponent().aliveTime; + }); - for (auto &entity: players) { - RAY3D::Model *model = dynamic_cast(entity.get().getComponent().drawable.get()); - std::string path = model->getTextureByMaterial(MAP_DIFFUSE).getResourcePath(); - playersIconPath.push_back(path.replace(path.find("textures"), std::string("textures").size(), "icons")); - } + for (auto &entity: players) { + RAY3D::Model *model = dynamic_cast(entity.get().getComponent().drawable.get()); + std::string path = model->getTextureByMaterial(MAP_DIFFUSE).getResourcePath(); + playersIconPath.push_back(path.replace(path.find("textures"), std::string("textures").size(), "icons")); + } - addMenuControl(*scene); - scene->addEntity("Audio ressources") + addMenuControl(*scene); + scene->addEntity("Audio ressources") .addComponent("assets/musics/music_result.ogg") .addComponent(sounds); scene->addEntity("background") @@ -55,39 +55,39 @@ namespace BBM scene->addEntity("scene title text") .addComponent(1920 / 3.25, 100, 0) .addComponent("GAME OVER", 120, RAY::Vector2(), ORANGE); - scene->addEntity("scene title text") + scene->addEntity("scene title text") .addComponent(1920 / 2.37, 250, 0) .addComponent("CONGRATS", 50, RAY::Vector2(), ORANGE); - for (int i = 0; i < players.size(); i++) { + for (int i = 0; i < players.size(); i++) { auto &playerTile = scene->addEntity("player tile") .addComponent(224 * (i + 1) + 200 * i, 1080 / 2.5, 0) - .addComponent(RAY::Vector2(224 * (i + 1) + 200 * i, 1080 / 3), RAY::Vector2(200, 200),tilesColor[i]); - auto &playerRank = scene->addEntity("player rank name") + .addComponent(RAY::Vector2(224 * (i + 1) + 200 * i, 1080 / 3), + RAY::Vector2(200, 200), tilesColor[i]); + auto &playerRank = scene->addEntity("player rank name") .addComponent(224 * (i + 1) + 200 * i, 1080 / 2.75, 0) - .addComponent(rankName[i], 30, RAY::Vector2(224 * (i + 1) + 200 * i, 1080 / 3), tilesColor[i]); + .addComponent(rankName[i], 30, + RAY::Vector2(224 * (i + 1) + 200 * i, 1080 / 3), + tilesColor[i]); auto &player = scene->addEntity("player") .addComponent(224 * (i + 1) + 200 * i, 1080 / 2.5, 0) .addComponent(playersIconPath[i]); - } - scene->addEntity("back to main menu") + } + scene->addEntity("back to main menu") .addComponent(10, 1080 - 85, 0) .addComponent("assets/buttons/button_back.png") - .addComponent([](WAL::Entity &entity, WAL::Wal &) - { + .addComponent([](WAL::Entity &entity, WAL::Wal &) { gameState.nextScene = BBM::GameState::SceneID::MainMenuScene; }) - .addComponent([](WAL::Entity &entity, WAL::Wal &) - { + .addComponent([](WAL::Entity &entity, WAL::Wal &) { RAY::Texture *texture = dynamic_cast(entity.getComponent().drawable.get()); texture->use("assets/buttons/button_back.png"); }) - .addComponent([](WAL::Entity &entity, WAL::Wal &) - { + .addComponent([](WAL::Entity &entity, WAL::Wal &) { RAY::Texture *texture = dynamic_cast(entity.getComponent().drawable.get()); texture->use("assets/buttons/button_back_hovered.png"); }); - return scene; - } + return scene; + } } \ No newline at end of file diff --git a/sources/System/EndCondition/EndConditionSystem.cpp b/sources/System/EndCondition/EndConditionSystem.cpp index 0403d3a1..fdabe35a 100644 --- a/sources/System/EndCondition/EndConditionSystem.cpp +++ b/sources/System/EndCondition/EndConditionSystem.cpp @@ -4,7 +4,8 @@ #include "Runner/Runner.hpp" #include "Component/Score/ScoreComponent.hpp" -namespace BBM { +namespace BBM +{ EndConditionSystem::EndConditionSystem(WAL::Wal &wal) : System(wal) @@ -17,9 +18,9 @@ namespace BBM { if (!view.size()) return; - for (auto & [_ , scoreComponent, healthComponent]: view) - alivePlayersCount += (healthComponent.getHealthPoint() != 0); - if (alivePlayersCount <= 1) - Runner::gameState.nextScene = Runner::gameState.ScoreScene; + for (auto &[_, scoreComponent, healthComponent]: view) + alivePlayersCount += (healthComponent.getHealthPoint() != 0); + if (alivePlayersCount <= 1) + Runner::gameState.nextScene = Runner::gameState.ScoreScene; } } \ No newline at end of file