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

WIP added msnu bgm again

Browse Source
This commit is contained in:
Stiffly
2015-10-22 11:12:35 +02:00
parent 16560a86b3
commit 01ff8763b8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Physics/PhysicsSystem.cpp
+1 -1
View File
@@ -822,7 +822,7 @@ bool dd::Systems::PhysicsSystem::OnContact(const dd::Events::Contact &event)
} }
Events::PlaySound se; Events::PlaySound se;
//Spawn a particle when a brick collides with somthing //Spawn a particle when a brick collides with something
Events::CreateParticleSequence e; Events::CreateParticleSequence e;
e.EmitterLifeTime = 3; e.EmitterLifeTime = 3;
e.EmittingAngle = glm::half_pi<float>(); e.EmittingAngle = glm::half_pi<float>();
src/game/Sound/SoundSystem.cpp
+7 -7
View File
@@ -6,12 +6,12 @@ dd::Systems::SoundSystem::~SoundSystem()
for (auto &bgm : m_BGMSourcesToBuffers) { for (auto &bgm : m_BGMSourcesToBuffers) {
alSourceStop(bgm.first); alSourceStop(bgm.first);
alDeleteSources(1, &bgm.first); alDeleteSources(1, &bgm.first);
bgm.second->~Sound(); //bgm.second->~Sound();
} }
for (auto &sfx : m_SFXSourcesToBuffers) { for (auto &sfx : m_SFXSourcesToBuffers) {
alSourceStop(sfx.first); alSourceStop(sfx.first);
alDeleteSources(1, &sfx.first); alDeleteSources(1, &sfx.first);
sfx.second->~Sound(); //sfx.second->~Sound();
} }
m_BGMSourcesToBuffers.clear(); m_BGMSourcesToBuffers.clear();
m_SFXSourcesToBuffers.clear(); m_SFXSourcesToBuffers.clear();
@@ -46,11 +46,11 @@ void dd::Systems::SoundSystem::Initialize()
m_BGMMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.BGMVolume", 1.f); m_BGMMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.BGMVolume", 1.f);
//TODO: Move this //TODO: Move this
// Events::PlaySound e; Events::PlaySound e;
// e.FilePath = MENU_BGM; e.FilePath = MENU_BGM;
// e.IsAmbient = true; e.IsAmbient = true;
// e.Gain = 0.2f; e.Gain = 0.2f;
// EventBroker->Publish(e); EventBroker->Publish(e);
} }
void dd::Systems::SoundSystem::Update(double dt) void dd::Systems::SoundSystem::Update(double dt)