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

Escape-the-Dawn/Components/PowerUp.h

@@ -9,6 +9,7 @@ namespace Components
 struct PowerUp : Component
 {
 	float Speed;
+	float Duration;
 };
 
 }

Escape-the-Dawn/Systems/LevelGenerationSystem.cpp

@@ -80,6 +80,7 @@ void Systems::LevelGenerationSystem::SpawnObstacle()
 
 			auto powerUp = m_World->AddComponent<Components::PowerUp>(ent, "PowerUp");
 			powerUp->Speed = 200.f;
+			powerUp->Duration = 5.f;
 
 			model->ModelFile = "Models/powerup.obj";
 		}

Escape-the-Dawn/Systems/PlayerSystem.cpp

@@ -10,6 +10,7 @@ Systems::PlayerSystem::PlayerSystem( World* world ) : System(world)
 	m_CameraOrientation = glm::angleAxis<float>(glm::radians(15.0f),glm::vec3(1,0,0));
 
 	freecamEnabled = false;
+	m_PowerUpTotalDuration = 5.f;
 	m_poweruptimeleft = 0;
 	m_basespeed = 125.f;
 	m_maxspeed = 125.f;
@@ -18,7 +19,10 @@ Systems::PlayerSystem::PlayerSystem( World* world ) : System(world)
 
 void Systems::PlayerSystem::Update(double dt)
 {
+	if (m_poweruptimeleft > 0)
 		m_poweruptimeleft -= (float)dt;
+	else
+		m_poweruptimeleft = 0;
 }
 
 void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
@@ -185,13 +189,8 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			bounds->VolumeVector.x = m_PlayerOriginalBounds.x * glm::cos(glm::radians(Euler.z));
 		}
 
-		auto cameraEntity = m_World->GetProperty<EntityID>(entity, "Camera");
-		auto cameracamera = m_World->GetComponent<Components::Camera>(cameraEntity, "Camera");
-		cameracamera->FOV = glm::radians(45.f + transform->Velocity.z/3.f );
-
 		auto collision = m_World->GetComponent<Components::Collision>(entity, "Collision");
-		if(collision != nullptr)
+
-		{
 		// Obstacle collision
 		for(auto ent : collision->CollidingEntities)
 		{
@@ -216,12 +215,14 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			if (m_World->GetProperty<std::string>(ent, "Name") == "Obstacle_SoundTrigger")
 			{
 				auto parent = m_World->GetEntityParent(ent);
+				auto parentTransform = m_World->GetComponent<Components::Transform>(parent, "Transform");
 				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;
+				swooshSound->Pitch = 1.f - (glm::length(parentTransform->Scale) / 12.f) * 0.5f;
 				auto soundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem");
 				soundSystem->PlaySound(swooshSound.get(), "Sounds/swoosh.wav");
 				m_World->RemoveEntity(ent);
@@ -236,18 +237,20 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			{
 				auto powerupComp = m_World->GetComponent<Components::PowerUp>(ent, "PowerUp");
 				m_maxspeed = powerupComp->Speed;
-					m_poweruptimeleft = 5.f;
+				m_PowerUpTotalDuration = powerupComp->Duration;
+				m_poweruptimeleft = powerupComp->Duration;
 				m_World->RemoveEntity(ent);
 				SetPlayerLightColor(entity, glm::vec3(0.0, 1.0, 0.0));
 				auto soundSystem = m_World->GetSystem<Systems::SoundSystem>("SoundSystem");
 				soundSystem->PlaySound(soundEmitter, "Sounds/boom.wav");
 			}
 		}
+
 		if(m_poweruptimeleft <= 0)
 		{
 			m_maxspeed = m_basespeed;
-				SetPlayerLightColor(entity, glm::vec3(0.05f, 0.36f, 1.f));
 		}
+
 		if(transform->Velocity.z < m_maxspeed)
 		{
 			transform->Velocity.z += 100.f*dt;
@@ -260,18 +263,23 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			if(transform->Velocity.z <= m_maxspeed)
 				transform->Velocity.z = m_maxspeed;
 		}
-		}
+
+		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));
 
 		// Update camera
 		if(! freecamEnabled)
 		{
+			auto cameraEntity = m_World->GetProperty<EntityID>(entity, "Camera");
+
 			auto cameraTransform = m_World->GetComponent<Components::Transform>(cameraEntity, "Transform");
 			if (cameraTransform) {
 				cameraTransform->Position = transform->Position + m_CameraOffset;
 				cameraTransform->Orientation = m_CameraOrientation;
 			}
 			
-			
+			auto cameracamera = m_World->GetComponent<Components::Camera>(cameraEntity, "Camera");
+			cameracamera->FOV = glm::radians(45.f + transform->Velocity.z / 3.f);
 		}
 
 		// Update ground

Escape-the-Dawn/Systems/PlayerSystem.h

@@ -40,6 +40,7 @@ namespace Systems
 		float m_basespeed;
 		float m_maxspeed;
 
+		float m_PowerUpTotalDuration;
 		float m_poweruptimeleft;
 
 		void SetPlayerLightColor(EntityID player, glm::vec3 color);