phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-23 07:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Implement MPQ-path sound loading in AudioEngine

Browse source 
Add AssetManager hookup to AudioEngine so the path-based playSound2D/3D
overloads can load files on demand rather than requiring preloading.

- Add setAssetManager() to AudioEngine (called during world load alongside
  other audio manager initializations)
- playSound2D(mpqPath) now calls assetManager->readFile() then delegates
  to the vector<uint8_t> overload (removes the "not yet implemented" warning)
- playSound3D(mpqPath, position) same — delegates to the fully spatialized
  vector overload (was previously silently falling back to 2D)
This commit is contained in:
Kelsi 2026-02-17 18:52:19 -08:00
parent e73bedd78b
commit c998c945bf
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/audio/audio_engine.cpp
View file

@ -3,6 +3,7 @@
#include "core/logger.hpp"
#include "pipeline/asset_manager.hpp"
#include "../../extern/miniaudio.h"
#include <cstring>
@ -285,10 +286,16 @@ bool AudioEngine::playSound2D(const std::vector<uint8_t>& wavData, float volume,
}
bool AudioEngine::playSound2D(const std::string& mpqPath, float volume, float pitch) {
// TODO: Load from AssetManager
// For now, return false (not implemented)
LOG_WARNING("AudioEngine::playSound2D from MPQ path not yet implemented");
return false;
if (!assetManager_) {
LOG_WARNING("AudioEngine::playSound2D(path): no AssetManager set");
return false;
}
auto data = assetManager_->readFile(mpqPath);
if (data.empty()) {
LOG_WARNING("AudioEngine::playSound2D: failed to load '", mpqPath, "'");
return false;
}
return playSound2D(data, volume, pitch);
}
bool AudioEngine::playSound3D(const std::vector<uint8_t>& wavData, const glm::vec3& position,
@ -367,8 +374,16 @@ bool AudioEngine::playSound3D(const std::vector<uint8_t>& wavData, const glm::ve
bool AudioEngine::playSound3D(const std::string& mpqPath, const glm::vec3& position,
float volume, float pitch, float maxDistance) {
// TODO: Implement 3D positional audio
return playSound2D(mpqPath, volume, pitch);
if (!assetManager_) {
LOG_WARNING("AudioEngine::playSound3D(path): no AssetManager set");
return false;
}
auto data = assetManager_->readFile(mpqPath);
if (data.empty()) {
LOG_WARNING("AudioEngine::playSound3D: failed to load '", mpqPath, "'");
return false;
}
return playSound3D(data, position, volume, pitch, maxDistance);
}
bool AudioEngine::playMusic(const std::vector<uint8_t>& musicData, float volume, bool loop) {