LightcullingPass for forward+ is now separate from Renderer.cpp.

include/Engine/Rendering/LightCullingPass.h

@@ -1,6 +1,9 @@
 #ifndef LightCullingPass_h__
 #define LightCullingPass_h__
 
+#define TILE_SIZE 16 
+#define NUM_LIGHTS 1000
+
 #include "IRenderer.h"
 #include "LightCullingPassState.h"
 #include "ShaderProgram.h"
@@ -9,19 +12,67 @@
 class LightCullingPass
 {
 public:
-    LightCullingPass();
+    LightCullingPass(IRenderer* renderer);
     ~LightCullingPass();
 
-
     void GenerateNewFrustum();
-private:
     void CullLights();
 
-    void InitializeTextures();
+    GLuint FrustumSSBO() const { return m_FrustumSSBO; }
+    GLuint LightSSBO() const { return m_LightSSBO; }
+    GLuint LightGridSSBO() const { return m_LightGridSSBO; }
+    GLuint LightOffsetSSBO() const { return m_LightOffsetSSBO; }
+    GLuint LightIndexSSBO() const { return m_LightIndexSSBO; }
+private:
+
     void InitializeSSBOs();
     void InitializeShaderPrograms();
 
+    const IRenderer* m_Renderer;
 
+    GLuint m_FrustumSSBO = 0;
+    GLuint m_LightSSBO = 0;
+    GLuint m_LightGridSSBO = 0;
+    GLuint m_LightOffsetSSBO = 0;
+    GLuint m_LightIndexSSBO = 0;
+
+    ShaderProgram* m_CalculateFrustumProgram;
+    ShaderProgram* m_LightCullProgram;
+
+    struct Plane {
+        glm::vec3 Normal;
+        float d;
+    };
+
+    struct Frustum {
+        Plane Planes[4];
+    };
+    Frustum m_Frustums[80*45]; //TODO: Renderer: Make this change with resolution
+
+    void TEMPCreateLights();
+
+    //This should be a component
+    struct PointLight {
+        glm::vec4 Position = glm::vec4(0.f);
+        glm::vec4 Color = glm::vec4(1.f);
+        float Radius = 5.f;
+        float Intensity = 0.8f;
+        float Falloff = 0.3f;
+        float Padding = 1337;
+    };
+    PointLight m_PointLights[NUM_LIGHTS];
+
+    struct LightGrid {
+        float Start;
+        float Amount;
+        glm::vec2 Padding;
+    };
+
+    LightGrid m_LightGrid[80*45]; //TODO: Renderer: Make this change with resolution
+
+    int m_LightOffset = 0;
+
+    float m_LightIndex[80*45*200]; //TODO: Renderer: Make this change with resolution
 };
 
 

include/Engine/Rendering/PickingPass.h

@@ -1,6 +1,8 @@
 #ifndef PickingPass_h__
 #define PickingPass_h__
 
+
+
 #include "IRenderer.h"
 #include "PickingPassState.h"
 #include "FrameBuffer.h"
@@ -9,6 +11,8 @@
 #include "../Core/EventBroker.h"
 #include "EPicking.h"
 
+
+
 class PickingPass
 {
 public:
@@ -20,7 +24,6 @@ public:
 
     void Draw(RenderQueueCollection& rq);
 
-
     //Getters
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     const std::unordered_map<glm::vec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
@@ -28,7 +31,6 @@ public:
     GLuint DepthBuffer() const { return m_DepthBuffer; }
     const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }
 
-
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
 

include/Engine/Rendering/Renderer.h

@@ -12,11 +12,7 @@
 #include "../Core/World.h"
 #include "PickingPass.h"
 #include "DrawScenePass.h"
-
-
-#define TILE_SIZE 16 
-#define NUM_LIGHTS 1000
-
+#include "LightCullingPass.h"
 
 #include "../Core/EventBroker.h"
 #include "EPicking.h"
@@ -46,12 +42,12 @@ private:
 
     DrawScenePass* m_DrawScenePass;
     PickingPass* m_PickingPass;
+    LightCullingPass* m_LightCullingPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
     void InitializeShaders();
     void InitializeTextures();
-    void InitializeSSBOs();
     void InitializeRenderPasses();
     //TODO: Renderer: Get InputUpdate out of renderer
     void InputUpdate(double dt);
@@ -59,58 +55,18 @@ private:
     void DrawScreenQuad(GLuint textureToDraw);
 
     //----------------------Forward+-----------------------//
-    void CalculateFrustum();
-    void CullLights();
     void DrawForwardPlus(RenderQueueCollection& rq);
     //Frustum
-    struct Plane {
-        glm::vec3 Normal;
-        float d;
-    };
-
-    struct Frustum {
-        Plane Planes[4];
-    };
-    Frustum m_Frustums[80*45]; //TODO: Renderer: Make this change with resolution
-
-    //Lights
-    void TEMPCreateLights();
-    //TODO: Renderer: Add Directionllights, spotlights and area lights to this as type.
-    struct PointLight {
-        glm::vec4 Position = glm::vec4(0.f);
-        glm::vec4 Color = glm::vec4(1.f);
-        float Radius = 5.f;
-        float Intensity = 0.8f;
-        float Falloff = 0.3f;
-        float Padding = 1337;
-    };
-    PointLight m_PointLights[NUM_LIGHTS];
-
-    struct LightGrid {
-        float Start;
-        float Amount;
-        glm::vec2 Padding;
-    };
-
-    LightGrid m_LightGrid[80*45];
-
-    int m_LightOffset = 0;
-
-    float m_LightIndex[80*45*200];
+    
 
     //-------------------------SSBO------------------------//
-    GLuint m_FrustumSSBO = 0;
-    GLuint m_LightSSBO = 0;
-    GLuint m_LightGridSSBO = 0;
-    GLuint m_LightOffsetSSBO = 0;
-    GLuint m_LightIndexSSBO = 0;
+
 
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
 	ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_DrawScreenQuadProgram;
-    ShaderProgram* m_CalculateFrustumProgram;
-    ShaderProgram* m_LightCullProgram;
+
     ShaderProgram* m_ForwardPlusProgram;
 
 };