Fix/rb 66 sound effect still playing

src/Client/Raylib/Audio/Audio.cpp

@@ -39,6 +39,11 @@ namespace Raylib {
         SetSoundVolume(_sound, volume);
     }
 
+    bool Sound::isReady() const
+    {
+        return IsSoundReady(_sound);
+    }
+
     void Sound::unload()
     {
         UnloadSound(_sound);
@@ -115,7 +120,7 @@ namespace Raylib {
 
     bool Music::isReady() const
     {
-        return IsMusicStreamPlaying(_music);
+        return IsMusicReady(_music);
     }
 
     void Music::play() const

src/Client/Raylib/Audio/Audio.hpp

@@ -10,6 +10,8 @@
 #include <string>
 #include "raylib.h"
 
+#include <iostream>
+
 namespace Raylib {
     // Audio device management functions
     void initAudioDevice();
@@ -21,6 +23,7 @@ namespace Raylib {
     class Sound {
         public:
             Sound(const std::string& fileName, float volume = 0.5f);
+            bool isReady() const;
             void unload();
             void play() const;
             void stop() const;
@@ -43,6 +46,7 @@ namespace Raylib {
     class Music {
         public:
             Music(const std::string& fileName, float volume = 0.5f);
+            ~Music() { std::cout << "Music destructor" << std::endl;}
             void unload();
             bool isReady() const;
             void play() const;

src/Client/SceneManager.cpp

@@ -14,8 +14,8 @@
 
 #include "CustomTypes.hpp"
 
-constexpr int screenWidth  = 1920;
-constexpr int screenHeight = 1080;
+constexpr int screenWidth  = 800;
+constexpr int screenHeight = 450;
 
 // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
 bool SceneManager::_init             = false;

src/ECS/CMakeLists.txt

@@ -13,4 +13,5 @@ target_sources(
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/Registry.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Clock.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/UnloadRaylib.cpp
 )

src/ECS/Registry.cpp

@@ -29,13 +29,17 @@ std::size_t Registry::addEntity()
 
 void Registry::removeEntity(std::size_t id)
 {
+    unloadRaylibComponents(id);
     for (auto function : _removeComponentFunctions) {
         function(*this, id);
     }
 }
 
 void Registry::clear()
 {
+    for (std::size_t i = 0; i < _entitiesNb; i++) {
+        unloadRaylibComponents(i);
+    }
     _data.clear();
     _addComponentPlaceFunctions.clear();
     _removeComponentFunctions.clear();

src/ECS/Registry.hpp

@@ -76,6 +76,8 @@ class Registry {
 
         Clock &getClock();
 
+        void unloadRaylibComponents(std::size_t id);
+
     private:
         Registry();
 

src/ECS/SparseArray.hpp

@@ -15,7 +15,7 @@ class SparseArray {
     public:
         void add()
         {
-            _sparse.push_back(std::size_t(-1));
+            _sparse.emplace_back(std::size_t(-1));
         }
 
         void insertBack(const Component &value)
@@ -31,14 +31,14 @@ class SparseArray {
             }
 
             if (_sparse[id] > -1) {
-                _dense[_sparse[id]]     = value;
+                _dense[_sparse[id]]     = std::move(value);
                 _revSparse[_sparse[id]] = id;
                 return;
             }
 
             _sparse[id] = _dense.size();
-            _dense.push_back(value);
-            _revSparse.push_back(id);
+            _dense.emplace_back(std::move(value));
+            _revSparse.emplace_back(id);
         }
 
         void erase(std::size_t id)

src/ECS/Systems/Systems.cpp

@@ -12,6 +12,8 @@
 #include "Registry.hpp"
 #include "SystemManagersDirector.hpp"
 
+#include <iostream>
+
 namespace Systems {
     void windowCollision(std::size_t /*unused*/, std::size_t /*unused*/)
     {
@@ -137,8 +139,8 @@ namespace Systems {
     constexpr int enemyDamage                = 1;
     constexpr int playerHealth               = 5;
     constexpr int playerHealth2              = 5;
-    constexpr float musicVolume              = 0.02F;
-    constexpr float soundVolume              = 0.1F;
+    constexpr float musicVolume              = 0.10F;
+    constexpr float soundVolume              = 0.13F;
     constexpr float fontScale                = 2.0F;
     const float playerWidth                  = 25.0F;
     const float playerHeight                 = 25.0F;
@@ -196,10 +198,6 @@ namespace Systems {
             {std::nullopt});
         Registry::getInstance().setToFrontLayers(id);
 
-        Registry::getInstance().getComponents<Raylib::Music>().insertBack(
-            {musicPath, musicVolume});
-        Registry::getInstance().getComponents<Raylib::Sound>().insertBack(
-            {soundPath, soundVolume});
         Registry::getInstance().getComponents<Raylib::Text>().insertBack(
             {"Press SPACE to play music, ENTER to play sound, J to reset "
              "scene, ARROWS to move",
@@ -213,6 +211,18 @@ namespace Systems {
         SystemManagersDirector::getInstance()
             .getSystemManager(managerId)
             .removeSystem(systemId);
+
+        Raylib::Music music(musicPath, musicVolume);
+        Raylib::Sound sound(soundPath, soundVolume);
+
+        // AUDIO
+        Registry::getInstance().setToFrontLayers(id);
+        Registry::getInstance().addEntity();
+        Registry::getInstance().getComponents<Raylib::Music>().insertBack(
+            music);
+        Registry::getInstance().getComponents<Raylib::Sound>().insertBack(
+            sound);
+            std::cout << "Music and sound added" << std::endl;
     }
 
     std::vector<std::function<void(std::size_t, std::size_t)>> getECSSystems()

src/ECS/UnloadRaylib.cpp

@@ -0,0 +1,58 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** unloadRaylib
+*/
+
+#include "Registry.hpp"
+#include "Raylib.hpp"
+
+static void unloadSounds(std::size_t id)
+{
+    Registry::components<Raylib::Sound> arrSound =
+        Registry::getInstance().getComponents<Raylib::Sound>();
+
+    if (arrSound.exist(id)) {
+        arrSound[id].unload();
+    }
+}
+
+static void unloadMusic(std::size_t id)
+{
+    Registry::components<Raylib::Music> arrMusic =
+        Registry::getInstance().getComponents<Raylib::Music>();
+
+    if (arrMusic.exist(id)) {
+        arrMusic[id].unload();
+    }
+}
+
+static void unloadSprite(std::size_t id)
+{
+    Registry::components<Raylib::Sprite> arrSprite =
+        Registry::getInstance().getComponents<Raylib::Sprite>();
+
+    if (arrSprite.exist(id)) {
+        arrSprite[id].unloadSprite();
+    }
+}
+
+static void unloadImage(std::size_t id)
+{
+    Registry::components<Raylib::Image> arrImage =
+        Registry::getInstance().getComponents<Raylib::Image>();
+
+    if (arrImage.exist(id)) {
+        arrImage[id].unloadImage();
+    }
+}
+
+// NOLINTNEXTLINE(readability-convert-member-functions-to-static,-warnings-as-errors)
+void Registry::unloadRaylibComponents(std::size_t id)
+{
+    unloadSounds(id);
+    unloadMusic(id);
+    unloadSprite(id);
+    unloadImage(id);
+}