From 4faeb8a0ed061e80d7d06e5524fbd43dbe7a339d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Thu, 17 Jun 2021 22:32:10 +0200 Subject: [PATCH] modif load player to be less cancerous & for lobby loading we should use lobby functions --- a | 266 ----------------------------- lib/Ray/sources/Vector/Vector3.cpp | 2 +- sources/Parser/ParserYaml.cpp | 21 +-- sources/Parser/ParserYaml.hpp | 36 ++-- 4 files changed, 33 insertions(+), 292 deletions(-) delete mode 100644 a diff --git a/a b/a deleted file mode 100644 index 0e66280b..00000000 --- a/a +++ /dev/null @@ -1,266 +0,0 @@ -WARNING: SHADER: [ID 5] Failed to find shader attribute: vertexTexCoord2 -WARNING: SHADER: [ID 5] Failed to find shader attribute: vertexNormal -WARNING: SHADER: [ID 5] Failed to find shader attribute: vertexTangent -WARNING: SHADER: [ID 5] Failed to find shader attribute: vertexColor -WARNING: SHADER: [ID 5] Failed to find shader uniform: view -WARNING: SHADER: [ID 5] Failed to find shader uniform: projection -WARNING: SHADER: [ID 5] Failed to find shader uniform: matNormal -WARNING: SHADER: [ID 5] Failed to find shader uniform: colDiffuse -WARNING: SHADER: [ID 5] Failed to find shader uniform: texture1 -WARNING: SHADER: [ID 5] Failed to find shader uniform: texture2 -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader attribute: vertexTexCoord2 -WARNING: SHADER: [ID 8] Failed to find shader attribute: vertexTangent -WARNING: SHADER: [ID 8] Failed to find shader attribute: vertexColor -WARNING: SHADER: [ID 8] Failed to find shader uniform: view -WARNING: SHADER: [ID 8] Failed to find shader uniform: projection -WARNING: SHADER: [ID 8] Failed to find shader uniform: matNormal -WARNING: SHADER: [ID 8] Failed to find shader uniform: colDiffuse -WARNING: SHADER: [ID 8] Failed to find shader uniform: texture1 -WARNING: SHADER: [ID 8] Failed to find shader uniform: texture2 -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 5] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask -WARNING: SHADER: [ID 8] Failed to find shader uniform: mask diff --git a/lib/Ray/sources/Vector/Vector3.cpp b/lib/Ray/sources/Vector/Vector3.cpp index 8bf172c3..ca9ba556 100644 --- a/lib/Ray/sources/Vector/Vector3.cpp +++ b/lib/Ray/sources/Vector/Vector3.cpp @@ -31,4 +31,4 @@ RAY::Vector3::operator ::Vector3() const v.y = this->y; v.z = this->z; return v; -} \ No newline at end of file +} diff --git a/sources/Parser/ParserYaml.cpp b/sources/Parser/ParserYaml.cpp index 72d4fc3d..0ec1aa22 100644 --- a/sources/Parser/ParserYaml.cpp +++ b/sources/Parser/ParserYaml.cpp @@ -161,19 +161,21 @@ namespace BBM { {"green", GREEN} }; - playerName.push_back(node.getName()); - playerAssets.push_back(node.getProperty("texture_path")); - playerBombCount.push_back(_parseMaxBomb(node.getProperty("max_bomb"))); - playerExplosionRange.push_back(_parseExplosionRadius(node.getProperty("explosion_radius"))); - playerSpeed.push_back(_parseSpeed(node.getProperty("speed"))); - playerPosition.push_back(_parsePosition(node.getProperty("position"))); + playersInfos.emplace_back(PlayerInfos{ + node.getName(), + _parsePosition(node.getProperty("position")), + _parseMaxBomb(node.getProperty("max_bomb")), + _parseExplosionRadius(node.getProperty("explosion_radius")), + _parseSpeed(node.getProperty("speed")), + node.getProperty("texture_path") + }); if ((tmpAssets.find("red.png") == std::string::npos && tmpAssets.find("blue.png") == std::string::npos && tmpAssets.find("green.png") == std::string::npos && tmpAssets.find("yellow.png") == std::string::npos && tmpAssets.find("ai.png") == std::string::npos) || !std::filesystem::exists(tmpAssets)) { throw (ParserError("Error with saved map: One asset is invalid.\n Loading default maps...")); } - auto start = tmpAssets.find_last_of("/") + 1; + auto start = tmpAssets.find_last_of('/') + 1; auto color = map.at(tmpAssets.substr(start, tmpAssets.length() - start - 4)); auto resumeScene = Runner::gameState._loadedScenes[GameState::SceneID::ResumeLobbyScene]; auto &playerTile = resumeScene->addEntity("player tile") @@ -396,11 +398,6 @@ namespace BBM { { std::string line; Node node(nodeName); -#ifdef __linux__ - int endlNbChars = 1; -#elif _WIN32 - int endlNbChars = 2; -#endif while(std::getline(file, line)) { if (line.empty()) diff --git a/sources/Parser/ParserYaml.hpp b/sources/Parser/ParserYaml.hpp index 3e988312..07bac2b8 100644 --- a/sources/Parser/ParserYaml.hpp +++ b/sources/Parser/ParserYaml.hpp @@ -14,6 +14,13 @@ namespace BBM { class ParserYAML { private: + //! @brief The number of chars for endl + #ifdef __linux__ + static constexpr int endlNbChars = 1; + #elif _WIN32 + static constexpr int endlNbChars = 2; + #endif + //!@brief file block of the parser static std::stringstream _block; //!@brief file bonus of the parser @@ -99,18 +106,22 @@ namespace BBM { static Node parseFile(const std::string &path); - //! @brief All name that was into the file - static std::vector playerName; - //! @brief Player position - static std::vector playerPosition; - //! @brief The amount of bomb a player had - static std::vector playerBombCount; - //! @brief The explosion range of a player - static std::vector playerExplosionRange; - //! @brief The speed of a player - static std::vector playerSpeed; - //! @brief The assets of the player - static std::vector playerAssets; + + struct PlayerInfos { + std::string playerName; + //! @brief Player position + Vector3f playerPosition; + //! @brief The amount of bomb a player had + int playerBombCount; + //! @brief The explosion range of a player + int playerExplosionRange; + //! @brief The speed of a player + float playerSpeed; + //! @brief The assets of the player + std::string playerAssets; + }; + + static std::vector playersInfos; //!@param scene Scene to update //!@brief save yaml @@ -121,6 +132,5 @@ namespace BBM { //! @brief save file name static const std::string fileName; - }; } \ No newline at end of file