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

# Conflicts: # include/Engine/Rendering/RenderQueue.h # include/Engine/Rendering/RenderSystem.h # include/Game/Game.h # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp
2016-01-18 17:44:26 +01:00
parent 92553f1e93 bf3f8aea89
commit 2a93e2ae7f
159 changed files with 4202 additions and 990 deletions
@@ -12,19 +12,20 @@
 #include "RenderJob.h"
 #include "ModelJob.h"
 #include "TextJob.h"
+#include "PointLightJob.h"

 struct RenderScene
 {
    ::Camera* Camera;
    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
-    std::list<std::shared_ptr<RenderJob>> LightJobs;
+    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
    std::list<std::shared_ptr<RenderJob>> TextJobs;
    Rectangle Viewport;

 	void Clear()
 	{
        ForwardJobs.clear();
-        LightJobs.clear();
+        PointLightJobs.clear();
        TextJobs.clear();
 	}
 };