Merge remote-tracking branch 'origin/master' into Forward+

# Conflicts: # include/Engine/Rendering/Renderer.h # src/Engine/Rendering/RenderState.cpp # src/Engine/Rendering/Renderer.cpp
2015-12-18 15:27:47 +01:00
parent 069a6756b9 d0927373a3
commit d38f58165f
64 changed files with 2400 additions and 674 deletions
@@ -16,6 +16,7 @@

 #include "../Core/EventBroker.h"
 #include "EPicking.h"
+#include "ImGuiRenderPass.h"

 class Renderer : public IRenderer
 {
@@ -43,6 +44,7 @@ private:
    DrawScenePass* m_DrawScenePass;
    PickingPass* m_PickingPass;
    LightCullingPass* m_LightCullingPass;
+    ImGuiRenderPass* m_ImGuiRenderPass;

    //----------------------Functions----------------------//
    void InitializeWindow();