From ef9f6a296bc617b1f7d922085d589639cc3785b2 Mon Sep 17 00:00:00 2001
From: tleety <dahltobbe@hotmail.com>
Date: Tue, 15 Sep 2015 17:38:16 +0200
Subject: [PATCH] Renderer working and some test blocks in the world

---
 include/Core/Engine.h                          | 10 ++++------
 src/game/Core/Shaders/Deferred/3/Fragment.glsl |  3 ++-
 src/game/Game/PadSystem.cpp                    |  2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index 5a1270d..0345813 100755
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -70,9 +70,6 @@ public:
         m_World->SystemFactory.Register<Systems::TransformSystem>(
                 [this]() { return new Systems::TransformSystem(m_World.get(), m_EventBroker); });
         m_World->AddSystem<Systems::TransformSystem>();
-//		m_World->ComponentFactory.Register<Components::Model>();
-//		m_World->ComponentFactory.Register<Components::Template>();
-
 
         m_World->ComponentFactory.Register<Components::Sprite>();
 
@@ -130,9 +127,9 @@ public:
 		{
 			auto t_Light = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_Light);
-			transform->Position = glm::vec3(0.f, 0.f, -9.f);
+			transform->Position = glm::vec3(2.f, 1.5f, -10.f);
 			auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
-			pl->Radius = 10.f;
+			pl->Radius = 8.f;
 		}
 
 		//Halfpipe background test model.
@@ -150,10 +147,11 @@ public:
 			auto t_Brick = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_Brick);
 			transform->Position = glm::vec3(0.f, 0.f, -12.f);
+			transform->Orientation = glm::rotate(glm::quat(), 0.5f, glm::vec3(0,-1,-1));
 			auto model = m_World->AddComponent<Components::Model>(t_Brick);
 			model->ModelFile = "Models/Test/Brick/Brick.obj";
-		}
 
+		}
 
 		{
 			auto topWall = m_World->CreateEntity();
diff --git a/src/game/Core/Shaders/Deferred/3/Fragment.glsl b/src/game/Core/Shaders/Deferred/3/Fragment.glsl
index c08e74d..61f54ac 100755
--- a/src/game/Core/Shaders/Deferred/3/Fragment.glsl
+++ b/src/game/Core/Shaders/Deferred/3/Fragment.glsl
@@ -39,6 +39,7 @@ void main()
 	//frag_Diffuse = DiffuseTexel * (vec4(La, 0.0) * (vec4(LightingTexel.rgb, 0.0) + vec4(LightingTexel.a, LightingTexel.a, LightingTexel.a, 0.0)));
 	//frag_Diffuse = DiffuseTexel * (vec4(La, 0.0) + LightingTexel);
 	//frag_Diffuse = DiffuseTexel * (vec4(1.f, 1.f, 1.f, 0.0) + LightingTexel);
-	frag_Diffuse = DiffuseTexel;
+	frag_Diffuse = DiffuseTexel + LightingTexel;
+	//frag_Diffuse = DiffuseTexel;
 	//frag_Diffuse = vec4(LightingTexel.r, LightingTexel.g, LightingTexel.b, 1.0);
 }
\ No newline at end of file
diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp
index 5ea8443..d636d85 100755
--- a/src/game/Game/PadSystem.cpp
+++ b/src/game/Game/PadSystem.cpp
@@ -7,6 +7,7 @@
 #include "Core/World.h"
 #include <iostream>
 #include <Game/CPad.h>
+#include <Rendering/CPointLight.h>
 
 
 void dd::Systems::PadSystem::Initialize()
@@ -147,6 +148,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
     transform->Scale = glm::vec3(1.f, 1.f, 1.f);
     auto model = m_World->AddComponent<Components::Model>(ent);
     model->ModelFile = "Models/Test/Ball/Ballopus.obj";
+    //auto pointlight = m_World->AddComponent<Components::PointLight>(ent);
     std::shared_ptr<Components::CircleShape> circleShape = m_World->AddComponent<Components::CircleShape>(ent);
     std::shared_ptr<Components::Ball> cball = m_World->AddComponent<Components::Ball>(ent);
     std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);