From 242fa2eaaa7034505f7bab4f81c99d6e218f2b94 Mon Sep 17 00:00:00 2001 From: Tleety Date: Tue, 2 Jun 2015 01:00:48 +0200 Subject: [PATCH] Pitch changes with angle of the ship --- Escape-the-Dawn/Systems/PlayerSystem.cpp | 4 +++- Escape-the-Dawn/Systems/PlayerSystem.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Escape-the-Dawn/Systems/PlayerSystem.cpp b/Escape-the-Dawn/Systems/PlayerSystem.cpp index 974ccaf..4824258 100644 --- a/Escape-the-Dawn/Systems/PlayerSystem.cpp +++ b/Escape-the-Dawn/Systems/PlayerSystem.cpp @@ -136,6 +136,7 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa float TurnSpeed = 1.0f; glm::vec3 Euler = glm::degrees(glm::eulerAngles(transform->Orientation)); + PitchAngleAdd = (float(abs(Euler.z))*float(abs(Euler.z))) / (25.0f*25.f); // Controls if(input->KeyState[GLFW_KEY_LEFT]) { @@ -266,10 +267,11 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa transform->Velocity.z = m_maxspeed; } + //Engine sound 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)); auto soundEmitterEngine = m_World->GetProperty(entity, "SoundEmitterEngine"); - soundEmitterEngine->Pitch = 1.f + percentage * 0.5f; + soundEmitterEngine->Pitch = 1.f + percentage * 0.5f + PitchAngleAdd * 0.5f; // Update camera if(! freecamEnabled) diff --git a/Escape-the-Dawn/Systems/PlayerSystem.h b/Escape-the-Dawn/Systems/PlayerSystem.h index 169a4d8..d573c8e 100644 --- a/Escape-the-Dawn/Systems/PlayerSystem.h +++ b/Escape-the-Dawn/Systems/PlayerSystem.h @@ -34,6 +34,7 @@ namespace Systems glm::vec3 m_PlayerOriginalBounds; glm::vec3 m_CameraOffset; glm::quat m_CameraOrientation; + float PitchAngleAdd; bool freecamEnabled;