Merge remote-tracking branch 'origin/master' into TextRendering

# Conflicts: # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderSystem.h # include/Engine/Rendering/Renderer.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-19 17:27:09 +01:00
parent f0763bc2a3 dfa96f74e1
commit ce27b224df
20 changed files with 285 additions and 121 deletions
@@ -13,6 +13,7 @@
 #include "ModelJob.h"
 #include "TextJob.h"
 #include "PointLightJob.h"
+#include "DirectionalLightJob.h"

 struct RenderScene
 {
@@ -20,6 +21,7 @@ struct RenderScene
    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
    std::list<std::shared_ptr<RenderJob>> TextJobs;
+    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
    Rectangle Viewport;

 	void Clear()
@@ -27,6 +29,7 @@ struct RenderScene
        ForwardJobs.clear();
        PointLightJobs.clear();
        TextJobs.clear();
+        DirectionalLightJobs.clear();
 	}
 };