CLIENT-MENU: Now users can choose parallax

MINOR
X-R-G-B · Nov 5, 2023 · bccdb28 · bccdb28
2 parents 0bd3618 + fd94088
commit bccdb28
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/assets/Audio/Musics/home.mp3 b/assets/Audio/Musics/home.mp3
diff --git a/assets/Json/menu.json b/assets/Json/menu.json
@@ -338,5 +338,9 @@
         "imgPath": "assets/Menu/loading.gif",
         "width": 100,
         "height": 100
+    },
+    "mainTheme": {
+        "path": "assets/Audio/Musics/home.mp3",
+        "volume": 0.65
     }
 }
diff --git a/src/Client/Systems/Menus/Menu/ButtonCallbacks.cpp b/src/Client/Systems/Menus/Menu/ButtonCallbacks.cpp
@@ -220,8 +220,14 @@ namespace Menu {
             }
             for (auto id : ids) {
                 if (arrText[id]->getCurrentText().find("PARALLAX") != std::string::npos) {
-                    Logger::info("parallax name" + std::to_string(Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr));
-                    std::string paraName = "PARALLAX_" + std::to_string(Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr);
+                    Logger::info(
+                        "parallax name"
+                        + std::to_string(
+                            Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr));
+                    std::string paraName =
+                        "PARALLAX_"
+                        + std::to_string(
+                            Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr);
 
                     arrText[id]->setCurrentText(paraName);
                 }

diff --git a/src/Client/Systems/Menus/Menu/MenuSystems.cpp b/src/Client/Systems/Menus/Menu/MenuSystems.cpp
@@ -187,13 +187,31 @@ namespace Systems {
             }
         }
 
+        static void initMainTheme()
+        {
+            Json &json = Json::getInstance();
+
+            nlohmann::json jsonData = json.getDataByJsonType<nlohmann::json>(
+                ResourcesManager::getPathByJsonType(JsonType::MENU),
+                "mainTheme");
+            if (json.isDataExist(jsonData, "path") && json.isDataExist(jsonData, "volume")) {
+                std::string musicPath     = json.getDataFromJson<std::string>(jsonData, "path");
+                float volume              = json.getDataFromJson<float>(jsonData, "volume");
+                Raylib::MusicShared music = Raylib::Music::fromFile(musicPath, volume);
+                music->setNeedToPlay(true);
+                Registry::getInstance().addEntity();
+                Registry::getInstance().getComponents<Raylib::MusicShared>().insertBack(music);
+            }
+        }
+
         void initMenu(std::size_t managerId, std::size_t systemId)
         {
             if (Scene::SceneManager::getInstance().getCurrentScene() != MENU) {
                 SystemManagersDirector::getInstance().getSystemManager(managerId).removeSystem(systemId);
                 return;
             }
             try {
+                initMainTheme();
                 Parallax::initParalax();
                 Logger::info("Init Parallax");
                 nlohmann::json jsonData = Json::getInstance().getDataByJsonType<nlohmann::json>(
@@ -299,13 +317,19 @@ namespace Systems {
 
         void resetParallaxTextForParallax(std::size_t /*unused*/, std::size_t /*unused*/)
         {
-            auto ids = Registry::getInstance().getEntitiesByComponents({typeid(Raylib::TextShared)});
+            auto ids     = Registry::getInstance().getEntitiesByComponents({typeid(Raylib::TextShared)});
             auto arrText = Registry::getInstance().getComponents<Raylib::TextShared>();
 
             for (auto id : ids) {
                 if (arrText[id]->getCurrentText().find("PARALLAX") != std::string::npos) {
-                    Logger::info("parallax name" + std::to_string(Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr));
-                    std::string paraName = "PARALLAX_" + std::to_string(Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr);
+                    Logger::info(
+                        "parallax name"
+                        + std::to_string(
+                            Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr));
+                    std::string paraName =
+                        "PARALLAX_"
+                        + std::to_string(
+                            Systems::Parallax::ActualParallax::getInstance()._actualParallaxNbr);
 
                     arrText[id]->setCurrentText(paraName);
                 }

diff --git a/src/Client/Systems/Parallax/Parallax.cpp b/src/Client/Systems/Parallax/Parallax.cpp
@@ -47,7 +47,7 @@ namespace Systems::Parallax {
             ResourcesManager::getPathByJsonType(
                 Parallax::ActualParallax::getInstance().getActualParallaxType()),
             "parallax");
-        
+
         for (auto &elem : parallaxData) {
             initParallaxEntity(elem);
             if (Json::getInstance().isDataExist(elem, "copy")

diff --git a/src/Nitwork/NitworkMainServer.cpp b/src/Nitwork/NitworkMainServer.cpp
@@ -180,7 +180,6 @@ namespace Nitwork {
                 << _T(maxNbPlayer) << _T(" ") << _T(gameType) << _T(" ") << _T(winName.c_str()) << _T(" ")
                 << _T(ownerIp.c_str()) << _T(" ") << _T(ownerPort);
 
-        Logger::fatal("cmdline: " + cmdline.str());
         STARTUPINFO si = {sizeof(si)};
         PROCESS_INFORMATION pi;
     #ifdef UNICODE