From 794635b6a1c114e8746a61db0d3d0d25d6b407e2 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Mon, 18 Jan 2016 14:58:19 +0100
Subject: [PATCH] Added DirectionalLights to renderqueue jobs

---
 include/Engine/Rendering/RenderQueue.h        |  3 ++
 .../Schema/Components/DirectionalLight.xml    |  1 +
 src/Engine/Rendering/RenderSystem.cpp         | 43 +++++++++++++------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/include/Engine/Rendering/RenderQueue.h b/include/Engine/Rendering/RenderQueue.h
index 119ea57f..8df967ac 100644
--- a/include/Engine/Rendering/RenderQueue.h
+++ b/include/Engine/Rendering/RenderQueue.h
@@ -12,6 +12,7 @@
 #include "RenderJob.h"
 #include "ModelJob.h"
 #include "PointLightJob.h"
+#include "DirectionalLightJob.h"
 
 
 /*
@@ -53,12 +54,14 @@ struct RenderScene
     ::Camera* Camera;
     std::list<std::shared_ptr<RenderJob>> ForwardJobs;
     std::list<std::shared_ptr<RenderJob>> PointLightJobs;
+    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
     Rectangle Viewport;
 
 	void Clear()
 	{
         ForwardJobs.clear();
         PointLightJobs.clear();
+        DirectionalLightJobs.clear();
 	}
 };
 
diff --git a/resources/Schema/Components/DirectionalLight.xml b/resources/Schema/Components/DirectionalLight.xml
index a14697c8..c854696a 100644
--- a/resources/Schema/Components/DirectionalLight.xml
+++ b/resources/Schema/Components/DirectionalLight.xml
@@ -1,4 +1,5 @@
 <c:PointLight>
+	<Direction X="0" Y="0" Z="0"/>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Intensity>0.8</Intensity>
 	<Visible>true</Visible>
diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp
index 11eca86b..eecf6786 100644
--- a/src/Engine/Rendering/RenderSystem.cpp
+++ b/src/Engine/Rendering/RenderSystem.cpp
@@ -102,22 +102,39 @@ void RenderSystem::fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World
 void RenderSystem::fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World* world)
 {
     auto pointLights = world->GetComponents("PointLight");
-    if (pointLights == nullptr) {
-        return;
+    if (pointLights != nullptr) {
+        for (auto& pointlightC : *pointLights) {
+            bool visible = pointlightC["Visible"];
+            if (!visible) {
+                continue;
+            }
+            auto transformC = world->GetComponent(pointlightC.EntityID, "Transform");
+            if (&transformC == nullptr) {
+                continue;
+            }
+
+            std::shared_ptr<PointLightJob> pointLightJob = std::shared_ptr<PointLightJob>(new PointLightJob(transformC, pointlightC, m_World));
+            jobs.push_back(pointLightJob);
+        }
     }
 
-    for (auto& pointlightC : *pointLights) {
-        bool visible = pointlightC["Visible"];
-        if (!visible) {
-            continue;
-        }
-        auto transformC = world->GetComponent(pointlightC.EntityID, "Transform");
-        if (&transformC == nullptr) {
-            return;
-        }
 
-        std::shared_ptr<PointLightJob> pointLightJob = std::shared_ptr<PointLightJob>(new PointLightJob(transformC, pointlightC, m_World));
-        jobs.push_back(pointLightJob);
+    auto directionalLights = world->GetComponents("DirectionalLight");
+    if (directionalLights != nullptr) {
+        for (auto& directionalLightC : *directionalLights) {
+            bool visable = directionalLightC["Visible"];
+            if (!visable) {
+                continue;
+            }
+
+            auto transformC = world->GetComponent(directionalLightC.EntityID, "Transform");
+            if(&transformC == nullptr) {
+                continue;
+            }
+
+            std::shared_ptr<DirectionalLightJob> directionalLightJob = std::shared_ptr<DirectionalLightJob>(new DirectionalLightJob(transformC, directionalLightC, m_World));
+            jobs.push_back(directionalLightJob);
+        }
     }
 }