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
@@ -13,6 +13,7 @@
 #include "Camera.h"
 #include "ModelJob.h"
 #include "Renderer.h"
+#include "PointLightJob.h"
 #include "../Core/Transform.h"
 #include "DebugCameraInputController.h"

@@ -46,6 +47,7 @@ private:
    
    void fillModels(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
    void fillText(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
+    void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);

    EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;
    bool OnInputCommand(const Events::InputCommand& e);