Fix/rb 66 sound effect still playing

CMakeLists.txt

@@ -85,6 +85,22 @@ if(CLANG_TIDY_EXE)
     endif()
 endif()
 
+# Add server or client definitions
+
+target_compile_definitions(
+    ${PROJECT_NAME_CLIENT}
+    PUBLIC
+    CLIENT
+)
+
+target_compile_definitions(
+    ${PROJECT_NAME_SERVER}
+    PUBLIC
+    SERVER
+)
+
+# Add compile options
+
 if(MSVC)
     target_compile_options(
         ${PROJECT_NAME_CLIENT}

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

@@ -21,6 +21,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;

src/Client/Raylib/CMakeLists.txt

@@ -6,6 +6,12 @@ target_include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+target_sources(
+    ${PROJECT_NAME_CLIENT}
+    PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/UnloadRaylib.cpp
+)
+
 add_subdirectory(Geometry)
 add_subdirectory(Graphics)
 add_subdirectory(Audio)

src/Client/Raylib/UnloadRaylib.cpp

@@ -0,0 +1,55 @@
+/*
+** EPITECH PROJECT, 2023
+** R-Bus
+** File description:
+** unloadRaylib
+*/
+
+#include "Raylib.hpp"
+#include "Registry.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);
+}

src/Client/SceneManager.cpp

@@ -7,13 +7,12 @@
 
 #include "SceneManager.hpp"
 #include "ClientSystems.hpp"
+#include "CustomTypes.hpp"
 #include "Logger.hpp"
 #include "Raylib.hpp"
 #include "Registry.hpp"
 #include "SystemManagersDirector.hpp"
 
-#include "CustomTypes.hpp"
-
 constexpr int screenWidth  = 1920;
 constexpr int screenHeight = 1080;
 

src/ECS/Registry.cpp

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

src/ECS/Registry.hpp

@@ -72,6 +72,10 @@ class Registry {
 
         Clock &getClock();
 
+#ifdef CLIENT
+        void unloadRaylibComponents(std::size_t id);
+#endif
+
         Logger::Logger &getLogger();
 
     private:

src/ECS/SparseArray.hpp

@@ -30,13 +30,13 @@ class SparseArray {
             }
 
             if (static_cast<int>(_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);
+            _dense.push_back(std::move(value));
             _revSparse.push_back(id);
         }
 

src/ECS/Systems/Systems.cpp

@@ -368,12 +368,28 @@ namespace Systems {
         SystemManagersDirector::getInstance().getSystemManager(managerId).removeSystem(systemId);
     }
 
+    void initAudio(std::size_t /*managerId*/, std::size_t /*systemId*/)
+    {
+        const std::string musicPath = "assets/Audio/Musics/Title.mp3";
+        const std::string soundPath = "assets/Audio/Sounds/fire.ogg";
+        constexpr float musicVolume = 0.10F;
+        constexpr float soundVolume = 0.13F;
+
+        Raylib::Music music(musicPath, musicVolume);
+        Raylib::Sound sound(soundPath, soundVolume);
+
+        Registry::getInstance().addEntity();
+        Registry::getInstance().getComponents<Raylib::Music>().insertBack(music);
+        Registry::getInstance().getComponents<Raylib::Sound>().insertBack(sound);
+    }
+
     std::vector<std::function<void(std::size_t, std::size_t)>> getECSSystems()
     {
         return {
             windowCollision,
             initPlayer,
             initParalax,
+            initAudio,
             entitiesCollision,
             moveEntities,
 #ifndef NDEBUG