From b77c357990b788120c9f6bdd91d8b5164f82194c Mon Sep 17 00:00:00 2001 From: tleety Date: Fri, 25 Sep 2015 03:33:30 +0200 Subject: [PATCH] Changed some lighting and the background pipe scale --- include/Core/Engine.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/include/Core/Engine.h b/include/Core/Engine.h index a572b53..b1e831c 100755 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -147,9 +147,23 @@ public: { auto t_Light = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_Light); - transform->Position = glm::vec3(2.f, 1.5f, -9.f); + transform->Position = glm::vec3(-3.f, 6.f, -5.f); auto pl = m_World->AddComponent(t_Light); - pl->Radius = 8.f; + pl->Radius = 20.f; + pl->Diffuse = glm::vec3(0.8f, 0.7f, 0.05f); + auto model = m_World->AddComponent(t_Light); + model->ModelFile = "Core/UnitSphere.obj"; + m_World->CommitEntity(t_Light); + } + { + auto t_Light = m_World->CreateEntity(); + auto transform = m_World->AddComponent(t_Light); + transform->Position = glm::vec3(3.f, -5.f, -5.f); + auto pl = m_World->AddComponent(t_Light); + pl->Radius = 15.f; + pl->Diffuse = glm::vec3(0.1f, 0.5f, 0.8f); + auto model = m_World->AddComponent(t_Light); + model->ModelFile = "Core/UnitSphere.obj"; m_World->CommitEntity(t_Light); } @@ -158,7 +172,7 @@ public: auto t_halfPipe = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_halfPipe); transform->Position = glm::vec3(0.f, 0.f, -15.f); - transform->Scale = glm::vec3(15.f); + transform->Scale = glm::vec3(6.f, 6.f, 10.f); auto model = m_World->AddComponent(t_halfPipe); model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj"; model->Color = glm::vec4(1.f, 1.f, 1.f, 0.3f);