I'm coming at you like a dark horse

This commit is contained in:
Stiffly
2014-05-29 21:40:51 +02:00
parent 2ec484c906
commit 128ff7ae4b
4 changed files with 8 additions and 7 deletions
-1
View File
@@ -1005,7 +1005,6 @@ void GameWorld::Initialize()
transform->Position = glm::vec3(20,2,-100); transform->Position = glm::vec3(20,2,-100);
transform->Scale = glm::vec3(3); transform->Scale = glm::vec3(3);
auto emitterComponent = AddComponent<Components::SoundEmitter>(se1); auto emitterComponent = AddComponent<Components::SoundEmitter>(se1);
emitterComponent->Path = "Sounds/WUB.mp3";
emitterComponent->MinDistance = 0.1f; emitterComponent->MinDistance = 0.1f;
emitterComponent->MaxDistance = 100000.f; emitterComponent->MaxDistance = 100000.f;
emitterComponent->Gain = 1; emitterComponent->Gain = 1;
+4 -5
View File
@@ -44,17 +44,16 @@ void InputManager::Update(double dt)
if(m_CurrentKeyState[GLFW_KEY_Z]) //TEMP if(m_CurrentKeyState[GLFW_KEY_Z]) //TEMP
{ {
Events::PlayBGM e; Events::PlaySFX e;
e.Resource = "Sounds/BGM/MainMenu.mp3"; e.Resource = "Sounds/BGM/DarkHorse.mp3";
e.Loop = true; e.Loop = true;
e.Emitter = 58;
EventBroker->Publish(e); EventBroker->Publish(e);
} }
if(m_CurrentKeyState[GLFW_KEY_P]) //TEMP if(m_CurrentKeyState[GLFW_KEY_P]) //TEMP
{ {
Events::StopSound e; Events::StopSound e;
e.Emitter = 59; e.Emitter = 58;
EventBroker->Publish(e);
e.Emitter = 62;
EventBroker->Publish(e); EventBroker->Publish(e);
} }
+3 -1
View File
@@ -134,9 +134,11 @@ bool Systems::SoundSystem::PlaySFX(const Events::PlaySFX &event)
LOG_ERROR("FMOD: The Entity %i does not have a SoundEmitter-component, but is trying to play a sound", event.Emitter);FMOD_CHANNEL* channel = m_Channels[event.Emitter]; LOG_ERROR("FMOD: The Entity %i does not have a SoundEmitter-component, but is trying to play a sound", event.Emitter);FMOD_CHANNEL* channel = m_Channels[event.Emitter];
return false; return false;
} }
emitter->type = Components::SoundEmitter::SoundType::SOUND_3D; emitter->type = Components::SoundEmitter::SoundType::SOUND_3D;
Sound* sound = m_World->GetResourceManager()->Load<Sound>("Sound3D", event.Resource); Sound* sound = m_World->GetResourceManager()->Load<Sound>("Sound3D", event.Resource);
m_Sounds[event.Emitter] = *sound; m_Sounds[event.Emitter] = *sound;
FMOD_Sound_Set3DMinMaxDistance(*sound, emitter->MinDistance, emitter->MaxDistance);
PlaySound(&m_Channels[event.Emitter], m_Sounds[event.Emitter], 1.0, event.Loop); PlaySound(&m_Channels[event.Emitter], m_Sounds[event.Emitter], 1.0, event.Loop);
FMOD_System_Update(m_System); FMOD_System_Update(m_System);
@@ -154,8 +156,8 @@ bool Systems::SoundSystem::PlayBGM(const Events::PlayBGM &event)
{ {
auto emitter = m_World->CreateEntity(); auto emitter = m_World->CreateEntity();
auto eTransform = m_World->AddComponent<Components::Transform>(emitter); auto eTransform = m_World->AddComponent<Components::Transform>(emitter);
auto eComponent = m_World->AddComponent<Components::SoundEmitter>(emitter); auto eComponent = m_World->AddComponent<Components::SoundEmitter>(emitter);
m_Channels[emitter] = m_BGMChannel;
eComponent->type = Components::SoundEmitter::SoundType::SOUND_3D; eComponent->type = Components::SoundEmitter::SoundType::SOUND_3D;
Sound* sound = m_World->GetResourceManager()->Load<Sound>("Sound2D", event.Resource); Sound* sound = m_World->GetResourceManager()->Load<Sound>("Sound2D", event.Resource);
m_Sounds[emitter] = *sound; m_Sounds[emitter] = *sound;
+1
View File
@@ -46,6 +46,7 @@ private:
void PlaySound(FMOD_CHANNEL**, FMOD_SOUND*, float volume, bool loop); void PlaySound(FMOD_CHANNEL**, FMOD_SOUND*, float volume, bool loop);
FMOD_SYSTEM* m_System; FMOD_SYSTEM* m_System;
FMOD_CHANNEL* m_BGMChannel;
std::vector<EntityID> m_Listeners; std::vector<EntityID> m_Listeners;
std::map<EntityID, FMOD_CHANNEL*> m_Channels; std::map<EntityID, FMOD_CHANNEL*> m_Channels;
std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels; std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels;