Fixed some rendering bugs and some code refactoring

include/Engine/Rendering/DrawBloomPass.h

@@ -18,14 +18,16 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
     void InitializeBuffers();
+    void ClearBuffer();
 
     void FillGaussianBuffer(FrameBuffer* fb);
 
     void Draw(GLuint texture);
 
     //Getters
-    GLuint m_GaussianTexture_horiz;
-    GLuint m_GaussianTexture_vert;
+    //Return the blurred result of the texture that was sent into draw
+    GLuint GaussianTexture() const { return m_GaussianTexture_vert; }
+
 
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
@@ -37,6 +39,9 @@ private:
     //const LightCullingPass* m_LightCullingPass 
     GLuint m_iterations = 9;
 
+    GLuint m_GaussianTexture_horiz;
+    GLuint m_GaussianTexture_vert;
+
     FrameBuffer m_GaussianFrameBuffer_horiz;
     FrameBuffer m_GaussianFrameBuffer_vert;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -18,12 +18,12 @@ public:
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
     void Draw(RenderScene& scene);
+    void ClearBuffer();
 
-    //Todo: Should not be public
-    FrameBuffer m_BloomFrameBuffer;
-    GLuint m_BloomTexture;
-    GLuint m_SceneTexture;
-    GLuint m_DepthBuffer;
+    //Return the texture that is used in later stages to apply the bloom effect
+    GLuint BloomTexture() const { return m_BloomTexture; }
+    //Return the texture with diffuse and lighting of the scene.
+    GLuint SceneTexture() const { return m_SceneTexture; }
 
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
@@ -33,6 +33,11 @@ private:
     Texture* m_BlackTexture;
     Texture* TEMP_glowTestTexture;
 
+    FrameBuffer m_FinalPassFrameBuffer;
+    GLuint m_BloomTexture;
+    GLuint m_SceneTexture;
+    GLuint m_DepthBuffer;
+
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
 

include/Engine/Rendering/DrawFinalPassState.h

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

include/Engine/Rendering/Renderer.h

@@ -20,6 +20,7 @@
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
 #include "../Core/Transform.h"
+#include "imgui/imgui.h"
 
 class Renderer : public IRenderer
 {
@@ -45,6 +46,8 @@ private:
     Model* m_UnitQuad;
     Model* m_UnitSphere;
 
+    int m_DebugTextureToDraw = 0;
+
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
     ImGuiRenderPass* m_ImGuiRenderPass;

include/Engine/Rendering/Util/CommonFunctions.h

@@ -0,0 +1,17 @@
+#ifndef CommonFuntions_h__
+#define CommonFuntions_h__
+
+#include "../../Common.h"
+#include "../../OpenGL.h"
+#include "../../GLM.h"
+
+class CommonFuntions
+{
+public:
+    CommonFuntions() = delete;
+
+private:
+
+};
+
+#endif