Add randomize play for AudioSource

Author: Alvarwow69

module/includes/components/AudioSource.hpp

@@ -30,12 +30,20 @@ namespace sw
             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;
+
+            void defineBuffer(std::string name);
+            std::string randomHandler();
 
         public:
             explicit AudioSource(sw::GameObject& entity);
             ~AudioSource() override;
 
-            AudioSource& setAudio(std::string audio);
+            AudioSource& addAudio(std::string audio);
             AudioSource& play();
             AudioSource& pause();
             AudioSource& stop();
@@ -46,6 +54,8 @@ namespace sw
             AudioSource& setStartLoopPoint(float second);
             AudioSource& setEndPoint(float second);
             AudioSource& setEndLoopPoint(float second);
+            AudioSource& setRandomized(bool random);
+            AudioSource& setMaxOccurence(int occurence);
 
             friend AudioSourceManager;
     };

module/includes/resources/OpenResources.hpp

@@ -66,21 +66,21 @@ namespace sw
             //std::priority_queue<std::unique_ptr<void>> m_mt; materials -> dev 3
             // List des resources
         public:
-            static class TexturesMap : private std::map<std::string, std::shared_ptr<Texture>>
+            static class TexturesMap : public std::map<std::string, std::shared_ptr<Texture>>
             {
                 public:
                     using std::map<std::string, std::shared_ptr<Texture>>::operator[];
                     friend OpenResources;
             } m_ntext;
 
-            static class FontsMap : private std::map<std::string, std::shared_ptr<Font>>
+            static class FontsMap : public std::map<std::string, std::shared_ptr<Font>>
             {
                 public:
                     using std::map<std::string, std::shared_ptr<Font>>::operator[];
                     friend OpenResources;
             } m_nfont;
 
-            static class AudioMap : private std::map<std::string, std::shared_ptr<Audio>>
+            static class AudioMap : public std::map<std::string, std::shared_ptr<Audio>>
             {
                 public:
                     using std::map<std::string, std::shared_ptr<Audio>>::operator[];

module/sources/components/AudioSource.cpp

@@ -18,7 +18,12 @@ m_currentSample(0.0f),
 m_startPoint(0.0f),
 m_startLoopPoint(-1),
 m_endLoopPoint(-1),
-m_endPoint(-1)
+m_endPoint(-1),
+m_randomized(false),
+m_maxOccurence(-1),
+m_audios(),
+m_last(),
+m_lastOccurence(0)
 {
     alGenSources(1, &m_source);
 }
@@ -29,16 +34,50 @@ sw::AudioSource::~AudioSource() noexcept
     alDeleteSources(1, &m_source);
 }
 
-sw::AudioSource &sw::AudioSource::setAudio(std::string audio)
+void sw::AudioSource::defineBuffer(std::string name)
 {
-    auto audioFile = sw::OpenResources::m_naudio[audio];
-    alSourcei(m_source, AL_BUFFER, audioFile->getBuffer());
-    m_endPoint = audioFile->getDuration();
+    auto buffer = sw::OpenResources::m_naudio[name];
+    alSourcei(m_source, AL_BUFFER, buffer->getBuffer());
+    m_endPoint = buffer->getDuration();
+}
+
+std::string sw::AudioSource::randomHandler()
+{
+    int index;
+    std::string audioName;
+
+    if (m_audios.size() < 2)
+        return m_audios[0];
+    do {
+        index = std::rand() % (m_audios.size() - 1);
+        audioName = m_audios[index];
+    } while (m_last == audioName && m_lastOccurence == m_maxOccurence);
+    if (m_last == audioName)
+        m_lastOccurence++;
+    else {
+        m_lastOccurence = 1;
+        m_last = audioName;
+    }
+    return audioName;
+}
+
+sw::AudioSource &sw::AudioSource::addAudio(std::string audio)
+{
+    m_audios.emplace_back(audio);
+    if (m_audios.empty())
+        defineBuffer(m_audios[0]);
     return (*this);
 }
 
 sw::AudioSource &sw::AudioSource::play()
 {
+    int value;
+
+    alGetSourcei(m_source, AL_SOURCE_STATE, &value);
+    if (value == AL_PLAYING)
+        return *this;
+    if (m_randomized)
+        defineBuffer(randomHandler());
     alSourcePlay(m_source);
     return (*this);
 }
@@ -97,4 +136,18 @@ sw::AudioSource &sw::AudioSource::setEndLoopPoint(float second)
 {
     m_endLoopPoint = second;
     return (*this);
+}
+
+sw::AudioSource &sw::AudioSource::setRandomized(bool random)
+{
+    m_randomized = random;
+    if (!m_randomized)
+        defineBuffer(m_audios[0]);
+    return (*this);
+}
+
+sw::AudioSource &sw::AudioSource::setMaxOccurence(int occurence)
+{
+    m_maxOccurence = occurence;
+    return (*this);
 }