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/PlayerSystem.cpp
This commit is contained in:
Tleety
2015-06-02 00:42:03 +02:00
parent 3887e7abcf a7a17b3ebf
commit 582cdd2102
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/GameWorld.cpp
+21 -2
View File
@@ -93,8 +93,26 @@ void GameWorld::Initialize()
bounds = AddComponent<Components::Bounds>(m_Player, "Bounds"); bounds = AddComponent<Components::Bounds>(m_Player, "Bounds");
bounds->Origin = glm::vec3(0, 0, 2.f); bounds->Origin = glm::vec3(0, 0, 2.f);
bounds->VolumeVector = glm::vec3(2.7f, 0.7f, 1); bounds->VolumeVector = glm::vec3(2.7f, 0.7f, 1);
soundEmitter = AddComponent<Components::SoundEmitter>(m_Player, "SoundEmitter"); // Sound Emitter PowerUp
soundEmitter->Gain = 2.5f; auto soundPowerUp = CreateEntity(m_Player);
{
AddComponent<Components::Transform>(soundPowerUp, "Transform");
soundEmitter = AddComponent<Components::SoundEmitter>(soundPowerUp, "SoundEmitter");
soundEmitter->Gain = 2.5f;
SetProperty(m_Player, "SoundEmitterPowerUp", soundEmitter.get());
}
// Sound Emitter PowerUp
auto soundEngine = CreateEntity(m_Player);
{
AddComponent<Components::Transform>(soundEngine, "Transform");
soundEmitter = AddComponent<Components::SoundEmitter>(soundEngine, "SoundEmitter");
soundEmitter->Gain = 1.5f;
soundEmitter->Path = "Sounds/engine.wav";
soundEmitter->Loop = true;
auto soundSystem = GetSystem<Systems::SoundSystem>("SoundSystem");
soundSystem->PlaySound(soundEmitter.get(), "Sounds/engine.wav");
SetProperty(m_Player, "SoundEmitterEngine", soundEmitter.get());
}
// Player light // Player light
auto playerLight = CreateEntity(m_Player); auto playerLight = CreateEntity(m_Player);
SetProperty(m_Player, "LightLeft", playerLight); SetProperty(m_Player, "LightLeft", playerLight);
@@ -134,6 +152,7 @@ void GameWorld::Initialize()
pointLight->spotExponent = 0.0f; pointLight->spotExponent = 0.0f;
bounds = AddComponent<Components::Bounds>(playerLight, "Bounds"); bounds = AddComponent<Components::Bounds>(playerLight, "Bounds");
bounds->VolumeVector = glm::vec3(0.5f); bounds->VolumeVector = glm::vec3(0.5f);
// Player sound
/*ent = CreateEntity(); /*ent = CreateEntity();
transform = AddComponent<Components::Transform>(ent, "Transform"); transform = AddComponent<Components::Transform>(ent, "Transform");
Escape-the-Dawn/Sounds/engine.wav
BIN
View File
Binary file not shown.
Escape-the-Dawn/Systems/PlayerSystem.cpp
+4 -3
View File
@@ -131,8 +131,6 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
m_PlayerOriginalBounds = bounds->VolumeVector; m_PlayerOriginalBounds = bounds->VolumeVector;
} }
auto soundEmitter = m_World->GetComponent<Components::SoundEmitter>(entity, "SoundEmitter");
glm::vec3 Ship_Right = glm::vec3(glm::vec4(1, 0, 0, 0)); glm::vec3 Ship_Right = glm::vec3(glm::vec4(1, 0, 0, 0));
glm::vec3 Ship_Forward = glm::vec3(glm::vec4(0, 0, 1, 0)); glm::vec3 Ship_Forward = glm::vec3(glm::vec4(0, 0, 1, 0));
@@ -244,8 +242,9 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
m_poweruptimeleft = powerupComp->Duration; m_poweruptimeleft = powerupComp->Duration;
m_World->RemoveEntity(ent); m_World->RemoveEntity(ent);
SetPlayerLightColor(entity, glm::vec3(0.0, 1.0, 0.0)); SetPlayerLightColor(entity, glm::vec3(0.0, 1.0, 0.0));
auto soundEmitterPU = m_World->GetProperty<Components::SoundEmitter*>(entity, "SoundEmitterPowerUp");
auto soundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem"); auto soundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem");
soundSystem->PlaySound(soundEmitter, "Sounds/boom.wav"); soundSystem->PlaySound(soundEmitterPU, "Sounds/boom.wav");
} }
} }
@@ -269,6 +268,8 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
float percentage = m_poweruptimeleft / m_PowerUpTotalDuration; float percentage = m_poweruptimeleft / m_PowerUpTotalDuration;
SetPlayerLightColor(entity, glm::vec3(0.0, 1.0, 0.0) * percentage + (1.f - percentage) * glm::vec3(0.05f, 0.36f, 1.f)); SetPlayerLightColor(entity, glm::vec3(0.0, 1.0, 0.0) * percentage + (1.f - percentage) * glm::vec3(0.05f, 0.36f, 1.f));
auto soundEmitterEngine = m_World->GetProperty<Components::SoundEmitter*>(entity, "SoundEmitterEngine");
soundEmitterEngine->Pitch = 1.f + percentage * 0.5f;
// Update camera // Update camera
if(! freecamEnabled) if(! freecamEnabled)