BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/Systems/CollisionSystem.cpp
This commit is contained in:
Tleety
2015-06-01 23:30:05 +02:00
parent c15a082e4f b81d60799e
commit 076e1bba74
5 changed files with 83 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.cpp
+15 -1
View File
@@ -63,7 +63,7 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
}
}
LOG_DEBUG("Constant: %f\nLinear: %f\nQuadratic: %f", light->constantAttenuation, light->linearAttenuation, light->quadraticAttenuation);
//LOG_DEBUG("Constant: %f\nLinear: %f\nQuadratic: %f", light->constantAttenuation, light->linearAttenuation, light->quadraticAttenuation);
}
if (name == "Camera") {
@@ -212,6 +212,20 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
//TODO: Ljud som kommer från crashsite
}
if (m_World->GetProperty<std::string>(ent, "Name") == "Obstacle_SoundTrigger")
{
auto parent = m_World->GetEntityParent(ent);
auto swoosh = m_World->CreateEntity(parent);
m_World->AddComponent<Components::Transform>(swoosh, "Transform");
auto swooshSound = m_World->AddComponent<Components::SoundEmitter>(swoosh, "SoundEmitter");
swooshSound->Gain = 2.f;
swooshSound->MaxDistance = 5.f;
swooshSound->ReferenceDistance = 1.f;
auto soundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem");
soundSystem->PlaySound(swooshSound.get(), "Sounds/swoosh.wav");
m_World->RemoveEntity(ent);
}
}
//powerup