Merge branch 'master' into Menu

include/Engine/Rendering/DrawFinalPass.h

@@ -24,6 +24,8 @@ public:
     GLuint BloomTexture() const { return m_BloomTexture; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
+    FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+
 
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;

include/Engine/Rendering/TextPass.h

@@ -11,6 +11,7 @@
 #include "../Core/ResourceManager.h"
 #include "RenderQueue.h"
 #include "TextPassState.h"
+#include "FrameBuffer.h"
 
 class TextPass
 {
@@ -18,7 +19,7 @@ public:
     TextPass();
     void Initialize();
     void Update();
-    void Draw(RenderScene& scene);
+    void Draw(RenderScene& scene, FrameBuffer& frameBuffer);
 
 private:
     void renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix);

include/Engine/Rendering/TextPassState.h

@@ -6,7 +6,7 @@
 class TextPassState : public RenderState
 {
 public:
-    TextPassState();
+    TextPassState(GLuint frameBuffer);
     ~TextPassState();
 private: