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

WIP

Browse Source
This commit is contained in:
stiffly
2016-03-04 03:03:38 +01:00
parent 1227a795d7
commit a7c57da2c9
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Sound/SoundManager.cpp
+1 -4
View File
@@ -14,9 +14,6 @@ SoundManager::SoundManager(World* world, EventBroker* eventBroker)
alDistanceModel(AL_LINEAR_DISTANCE); alDistanceModel(AL_LINEAR_DISTANCE);
alDopplerFactor(1); alDopplerFactor(1);
//m_CurrentBGM = createSource("Audio/lalala.wav");
//playSound(m_CurrentBGM);
EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnEntity, &SoundManager::OnPlaySoundOnEntity); EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnEntity, &SoundManager::OnPlaySoundOnEntity);
EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnPosition, &SoundManager::OnPlaySoundOnPosition); EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnPosition, &SoundManager::OnPlaySoundOnPosition);
EVENT_SUBSCRIBE_MEMBER(m_EPlayBackgroundMusic, &SoundManager::OnPlayBackgroundMusic); EVENT_SUBSCRIBE_MEMBER(m_EPlayBackgroundMusic, &SoundManager::OnPlayBackgroundMusic);
@@ -122,7 +119,7 @@ void SoundManager::updateEmitters(double dt)
// Calculate velocity // Calculate velocity
glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt; glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt;
setSourcePos(it->second->ALsource, nextPos); setSourcePos(it->second->ALsource, nextPos);
setSourceVel(it->second->ALsource, glm::vec3(0)); //setSourceVel(it->second->ALsource, glm::vec3(0));
auto emitter = m_World->GetComponent(it->first, "SoundEmitter"); auto emitter = m_World->GetComponent(it->first, "SoundEmitter");
setSoundProperties(it->second, &emitter); setSoundProperties(it->second, &emitter);
src/Game/Systems/SoundSystem.cpp
+3 -21
View File
@@ -20,11 +20,7 @@ void SoundSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComp
{ } { }
void SoundSystem::Update(double dt) void SoundSystem::Update(double dt)
{ { }
if (!IsClient) {
return;
}
}
bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e) bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
{ {
@@ -51,26 +47,12 @@ bool SoundSystem::OnInputCommand(const Events::InputCommand & e)
return true; return true;
} }
} }
if (e.Command == "SoundTemp" && e.Value > 0) {
EntityWrapper entity(m_World, m_World->CreateEntity());
auto transform = m_World->AttachComponent(entity.ID, "Transform");
(glm::vec3&)transform["Position"] = glm::vec3(0, 10, 0);
(glm::vec3&)transform["Scale"] = glm::vec3(10, 10, 10);
auto emitter = m_World->AttachComponent(entity.ID, "SoundEmitter");
auto model = m_World->AttachComponent(entity.ID, "Model");
(std::string&)model["Resource"] = "Models/Core/UnitCube.mesh";
Events::PlaySoundOnEntity ev;
ev.Emitter = entity;
ev.FilePath = "Audio/crosscounter.wav";
m_EventBroker->Publish(ev);
}
return false; return false;
} }
void SoundSystem::playerJumps() void SoundSystem::playerJumps()
{ {
if (!LocalPlayer.Valid()) { if (!IsClient) { // Only play for clients
return; return;
} }
@@ -85,7 +67,7 @@ void SoundSystem::playerJumps()
bool SoundSystem::OnCaptured(const Events::Captured & e) bool SoundSystem::OnCaptured(const Events::Captured & e)
{ {
if (!LocalPlayer.Valid()) { if (!IsClient) { // Only play for clients
return false; return false;
} }
int homeTeam = (int)m_World->GetComponent(e.CapturePointTakenID, "Team")["Team"]; int homeTeam = (int)m_World->GetComponent(e.CapturePointTakenID, "Team")["Team"];