BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deleting an entity now tells openal to behave accordingly.

Browse Source
This commit is contained in:
stiffly
2016-01-12 14:51:10 +01:00
parent 729ebe6c8b
commit 5697e8bc85
1 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Sound/SoundSystem.cpp
+31 -12
View File
@@ -65,7 +65,7 @@ void SoundSystem::stopEmitters()
void SoundSystem::Update() void SoundSystem::Update()
{ {
//deleteInactiveEmitters(); // Not tested deleteInactiveEmitters();
addNewEmitters(); addNewEmitters();
updateEmitters(); updateEmitters();
updateListener(); updateListener();
@@ -73,19 +73,33 @@ void SoundSystem::Update()
void SoundSystem::deleteInactiveEmitters() void SoundSystem::deleteInactiveEmitters()
{ {
auto emitterComponents = m_World->GetComponents("SoundEmitter"); //auto emitterComponents = m_World->GetComponents("SoundEmitter");
for (auto it = emitterComponents->begin(); it != emitterComponents->end();) { //for (auto it = emitterComponents->begin(); it != emitterComponents->end();) {
EntityID emitter = (*it).EntityID; // EntityID emitter = (*it).EntityID;
if (isPlaying(m_Sources[emitter]->ALsource)) { // The sound is still playing, do not remove // if (isPlaying(m_Sources[emitter]->ALsource)) { // The sound is still playing, do not remove
// it++;
// continue;
// } else {
// alDeleteBuffers(1, &m_Sources[emitter]->ALsource);
// alDeleteSources(1, &m_Sources[emitter]->ALsource);
// //delete m_Sources[emitter]->SoundResource;
// m_Sources.erase(emitter);
// m_World->DeleteEntity(emitter);
// }
//}
std::unordered_map<EntityID, Source*>::iterator it;
for (it = m_Sources.begin(); it != m_Sources.end();) {
if (m_World->ValidEntity((*it).first)) {
// Entity is valid, move on.
it++; it++;
continue; continue;
} } else {
else { stopSound((*it).second);
alDeleteBuffers(1, &m_Sources[emitter]->ALsource); alDeleteBuffers(1, &m_Sources[(*it).first]->ALsource);
alDeleteSources(1, &m_Sources[emitter]->ALsource); alDeleteSources(1, &m_Sources[(*it).first]->ALsource);
//delete m_Sources[emitter]->SoundResource; //delete m_Sources[emitter]->SoundResource;
m_Sources.erase(emitter); it = m_Sources.erase(it);
m_World->DeleteEntity(emitter);
} }
} }
} }
@@ -116,8 +130,11 @@ void SoundSystem::addNewEmitters()
void SoundSystem::updateEmitters() void SoundSystem::updateEmitters()
{ {
auto emitterComponents = m_World->GetComponents("SoundEmitter"); auto emitterComponents = m_World->GetComponents("SoundEmitter");
for (auto it = emitterComponents->begin(); it != emitterComponents->end(); it++) { for (auto it = emitterComponents->begin(); it != emitterComponents->end();) {
EntityID emitter = (*it).EntityID; EntityID emitter = (*it).EntityID;
if (!m_World->ValidEntity(emitter)) { // Entity has been deleted
// Delete
} else {
std::unordered_map<EntityID, Source*>::iterator i; std::unordered_map<EntityID, Source*>::iterator i;
i = m_Sources.find(emitter); i = m_Sources.find(emitter);
if (i != m_Sources.end()) { if (i != m_Sources.end()) {
@@ -148,6 +165,8 @@ void SoundSystem::updateEmitters()
playSound(m_Sources[emitter]); playSound(m_Sources[emitter]);
} }
} }
it++;
}
} }
} }
} }