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

# Conflicts: # include/Engine/Rendering/RenderQueueFactory.h
2015-12-14 19:11:00 +01:00
parent 05b78265be 25683e8a8a
commit ef07a9d536
37 changed files with 1072 additions and 136 deletions
@@ -28,6 +28,7 @@ enum lightType

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

 class Renderer : public IRenderer
 {
@@ -56,6 +57,7 @@ private:

    DrawScenePass* m_DrawScenePass;
    PickingPass* m_PickingPass;
+    ImGuiRenderPass* m_ImGuiRenderPass;

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