perf: use asset loader and cache menu audio buffers

Author: LoayAhmed304

config/json-configs/sound.jsonc config/custom-configs/sound.jsoncconfig/json-configs/sound.jsonc renamed to config/custom-configs/sound.jsonc

@@ -126,6 +126,7 @@
                 }
             },
             "sounds": {
+                "gun-reload": "assets/sounds/gun_reload.wav",
                 "portal": "assets/sounds/portal.wav"
             }
         },

src/common/systems/audio-system.cpp

@@ -128,15 +128,17 @@ namespace our {
             // Set initial position
             glm::mat4 M = entity->getLocalToWorldMatrix();
             glm::vec3 sourcePos = M[3];
-            source = playSound(buffer, sourcePos, audioSource->gain, audioSource->pitch, audioSource->loop);
+            source = playSound(buffer, sourcePos, audioSource->gain, audioSource->pitch, audioSource->loop,
+                               audioSource->refDistance, audioSource->maxDistance);
         } else {
             source = playSound2D(buffer, audioSource->gain, audioSource->pitch, audioSource->loop);
         }
 
         audioSource->alSource = source;
     }
 
-    ALuint AudioSystem::playSound(AudioBuffer* buffer, const glm::vec3& position, float gain, float pitch, bool loop) {
+    ALuint AudioSystem::playSound(AudioBuffer* buffer, const glm::vec3& position, float gain, float pitch, bool loop,
+                                  float refDistance, float maxDistance) {
         if (!buffer) return 0;
 
         ALuint source = findAvailableSource();
@@ -154,9 +156,9 @@ namespace our {
         alSource3f(source, AL_POSITION, position.x, position.y, position.z);
 
         // Set attenuation defaults
-        alSourcef(source, AL_REFERENCE_DISTANCE, 5.0f);  // full volume within this distance
-        alSourcef(source, AL_MAX_DISTANCE, 100.0f);      // Attentuation limit
-        alSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);      // how quickly the sound attenuates with distance
+        alSourcef(source, AL_REFERENCE_DISTANCE, refDistance);  // full volume within this distance
+        alSourcef(source, AL_MAX_DISTANCE, maxDistance);        // Attentuation limit
+        alSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);             // how quickly the sound attenuates with distance
 
         alSourcePlay(source);
         checkALError("Playing sound");

src/common/systems/audio-system.hpp

@@ -29,7 +29,8 @@ namespace our {
         // - gain: volume multiplier
         // - pitch: speed multiplier
         // - loop: whether to keep looping the sound
-        ALuint playSound(AudioBuffer* buffer, const glm::vec3& position, float gain, float pitch, bool loop);
+        ALuint playSound(AudioBuffer* buffer, const glm::vec3& position, float gain, float pitch, bool loop,
+                         float refDistance, float maxDistance);
 
         // On-demand function to play a non-spatial sound (fire-and-forget)
         // Best used for UI, menu, or music sounds

src/states/menu-state.hpp

@@ -46,6 +46,10 @@ class Menustate : public our::State {
     float time;
     // An array of the button that we can interact with
     std::array<Button, 2> buttons;
+
+    our::AudioBuffer* menuMusic = nullptr;
+    our::AudioBuffer* menuSelectSound = nullptr;
+
     // Index of the currently hovered button (-1 = none). Used to detect hover-enter transitions.
     int hoveredButton = -1;
 
@@ -117,8 +121,10 @@ class Menustate : public our::State {
         buttons[1].size = {400.0f, 33.0f};
         buttons[1].action = [this]() { this->getApp()->close(); };
 
-        getApp()->getAudioSystem().playSound2D(our::audio_utils::loadWAV("assets/sounds/menu-music.wav"), 0.5f, 1.0f,
-                                               true);
+        // TODO: Maybe load them in application.cpp or serialize them from the config json
+        menuMusic = our::audio_utils::loadWAV("assets/sounds/menu-music.wav");
+        menuSelectSound = our::audio_utils::loadWAV("assets/sounds/menu-select.wav");
+        getApp()->getAudioSystem().playSound2D(menuMusic, 0.5f, 1.0f, true);
     }
 
     void onDraw(double deltaTime) override {
@@ -181,8 +187,7 @@ class Menustate : public our::State {
 
         // Play hover sound only on the frame the mouse first enters a button (edge detection)
         if (currentlyHovered != -1 && currentlyHovered != hoveredButton) {
-            getApp()->getAudioSystem().playSound2D(
-                our::audio_utils::loadWAV("assets/sounds/menu-select.wav"), 1.0, 1.0, false);
+            getApp()->getAudioSystem().playSound2D(menuSelectSound, 1.0, 1.0, false);
         }
         hoveredButton = currentlyHovered;
 

src/states/play-state.hpp

@@ -76,7 +76,7 @@ class Playstate : public our::State {
         if (keyboard.justPressed(GLFW_KEY_R)) {
             if (!getApp()->getAudioSystem().isPlaying(reloadSource)) { // TODO: remove when implementing a proper weapon/player system
                 reloadSource = getApp()->getAudioSystem().playSound2D(
-                    our::audio_utils::loadWAV("assets/sounds/gun_reload.wav"), 1.0f, 1.0f, false);
+                    our::AssetLoader<our::AudioBuffer>::get("gun-reload"), 1.0f, 1.0f, false);
             }
         }
         // clang-format on