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

# Conflicts: # include/Engine/Collision/CollidableOctreeSystem.h # include/Engine/Collision/CollisionSystem.h # include/Engine/Collision/TriggerSystem.h # include/Engine/Rendering/RenderSystem.h # include/Game/Systems/PlayerSystem.h # resources/Schema/Components/Physics.xsd # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp # src/Game/Systems/HealthSystem.cpp # src/Game/Systems/PlayerSystem.cpp # src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:05:08 +01:00
parent fc06a4babc c6e9aad0c7
commit a6548a72b3
84 changed files with 2952 additions and 1201 deletions
@@ -12,6 +12,7 @@
 #include "RenderJob.h"
 #include "ModelJob.h"
 #include "PointLightJob.h"
+#include "DirectionalLightJob.h"


 /*
@@ -53,6 +54,7 @@ struct RenderScene
    ::Camera* Camera = nullptr;
    std::list<std::shared_ptr<RenderJob>> ForwardJobs;
    std::list<std::shared_ptr<RenderJob>> PointLightJobs;
+    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
    Rectangle Viewport;
    bool ClearDepth = false;

@@ -60,6 +62,7 @@ struct RenderScene
 	{
        ForwardJobs.clear();
        PointLightJobs.clear();
+        DirectionalLightJobs.clear();
 	}
 };