Fix merge issue

Author: Alvarwow69

module/includes/components/AudioSource.hpp

@@ -23,42 +23,50 @@ namespace sw
 
     class SW_GRAPH_MODULE_EXPORT AudioSource : public sw::Component
     {
-        private:
-            ALuint m_source;
-            bool m_loop;
-            float m_currentSample;
-            float m_startPoint;
-            float m_startLoopPoint;
-            float m_endPoint;
-            float m_endLoopPoint;
-            bool m_randomized;
-            int m_maxOccurence;
-            std::vector<std::string> m_audios;
-            std::string m_last;
-            int m_lastOccurence;
+    private:
+        ALuint m_source;
+        bool m_loop;
+        float m_currentSample;
+        float m_startPoint;
+        float m_startLoopPoint;
+        float m_endPoint;
+        float m_endLoopPoint;
+        bool m_randomized;
+        int m_maxOccurence;
+        std::vector<std::string> m_audios;
+        std::string m_last;
+        int m_lastOccurence;float m_volume;
+        float m_pitch;
+        bool m_playOnStart;
+        YAML::Node save() const;
+
+        void playOnStart();
 
             void defineBuffer(std::string name);
             std::string randomHandler();
 
-        public:
-            explicit AudioSource(sw::GameObject& entity);
-            ~AudioSource() override;
+    public:
+        explicit AudioSource(sw::GameObject& entity);
+        ~AudioSource() override;
+
+        AudioSource& addAudio(std::string audio);
+        AudioSource& play();
+        AudioSource& pause();
+        AudioSource& stop();
+        AudioSource& setVolume(float volume);
+        AudioSource& setPitch(float pitch);
+        AudioSource& setLoop(bool loop);
+        AudioSource& setStartPoint(float second);
+        AudioSource& setStartLoopPoint(float second);
+        AudioSource& setEndPoint(float second);
+        AudioSource& setEndLoopPoint(float second);
+        AudioSource& setRandomized(bool random);
+        AudioSource& setMaxOccurrence(int occurence);
+        AudioSource& setPlayOnStart(bool value);
 
-            AudioSource& addAudio(std::string audio);
-            AudioSource& play();
-            AudioSource& pause();
-            AudioSource& stop();
-            AudioSource& setVolume(float volume);
-            AudioSource& setPitch(float pitch);
-            AudioSource& setLoop(bool loop);
-            AudioSource& setStartPoint(float second);
-            AudioSource& setStartLoopPoint(float second);
-            AudioSource& setEndPoint(float second);
-            AudioSource& setEndLoopPoint(float second);
-            AudioSource& setRandomized(bool random);
-            AudioSource& setMaxOccurence(int occurence);
+        [[nodiscard]]const bool& isPlayOnStart() const;
 
-            friend AudioSourceManager;
+        friend AudioSourceManager;
     };
 }
 

module/includes/managers/AudioSourceManager.hpp

@@ -24,7 +24,6 @@ namespace sw
             YAML::Node save() const;
             void onUpdate() override {};
             void onLoad(YAML::Node& node) override;
-            void onUpdate() override;
     }; // class AudioSourceManager
 
 } // namespace sw

module/sources/components/AudioSource.cpp

@@ -24,7 +24,10 @@ m_randomized(false),
 m_maxOccurence(-1),
 m_audios(),
 m_last(),
-m_lastOccurence(0)
+m_lastOccurence(0),
+m_volume(),
+m_pitch(),
+m_playOnStart(true)
 {
     alGenSources(1, &m_source);
     gameObject.scene().eventManager["Start"].subscribe(this, &AudioSource::playOnStart);
@@ -36,6 +39,12 @@ sw::AudioSource::~AudioSource() noexcept
     alDeleteSources(1, &m_source);
 }
 
+void sw::AudioSource::playOnStart()
+{
+    if (m_playOnStart)
+        play();
+}
+
 void sw::AudioSource::defineBuffer(std::string name)
 {
     auto buffer = sw::OpenResources::m_naudio[name];
@@ -150,9 +159,9 @@ sw::AudioSource &sw::AudioSource::setRandomized(bool random)
     return (*this);
 }
 
-sw::AudioSource &sw::AudioSource::setMaxOccurence(int occurence)
+sw::AudioSource &sw::AudioSource::setMaxOccurrence(int occurrence)
 {
-    m_maxOccurence = occurence;
+    m_maxOccurence = occurrence;
     return (*this);
 }
 
@@ -161,15 +170,14 @@ YAML::Node sw::AudioSource::save() const
     YAML::Node node;
 
     node["entity_name"] = name();
-    node["audioFile"] = m_audioFile;
     node["volume"] = m_volume;
     node["pitch"] = m_pitch;
     node["playOnStart"] = m_playOnStart;
 
     return (node);
 }
 
-const bool &sw::AudioSource::getPlayOnStart()
+const bool &sw::AudioSource::isPlayOnStart() const
 {
     return (m_playOnStart);
 }

module/sources/managers/AudioSourceManager.cpp

@@ -12,7 +12,7 @@ void sw::AudioSourceManager::onLoad(YAML::Node& node)
 {
     for (auto component : node["components"]) {
         sw::AudioSource& audio = createComponent(component["entity_name"].as<std::string>());
-        audio.setAudio(component["audioFile"].as<std::string>());
+        //audio.setAudio(component["audioFile"].as<std::string>());
         audio.setVolume(component["volume"].as<float>());
         audio.setPitch(component["pitch"].as<float>());
         audio.m_playOnStart = component["playOnStart"].as<bool>();