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

# Conflicts: # include/Engine/Rendering/DrawFinalPass.h # include/Engine/Rendering/Renderer.h # resources/Shaders/ForwardPlus.vert.glsl # resources/Shaders/ForwardPlusSkinned.vert.glsl # src/Engine/Rendering/Renderer.cpp
2016-03-09 19:38:55 +01:00
parent e494f6a495 fce6e90f3c
commit e25c9ee690
158 changed files with 29178 additions and 8731 deletions
@@ -18,6 +18,7 @@
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
 #include "CubeMapPass.h"
+#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -37,6 +38,7 @@ public:
 		: m_EventBroker(eventBroker)
 		, m_Config(config)
    { }
+	~Renderer();

    virtual void Initialize() override;
    virtual void Update(double dt) override;
@@ -77,6 +79,7 @@ private:
 	SSAOPass* m_SSAOPass;
    CubeMapPass* m_CubeMapPass;
 	ShadowPass* m_ShadowPass;
+    BlurHUD* m_BlurHUDPass;

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