Revert "Revert "Forward+""

This reverts commit b908a9f9c6.

include/Engine/Rendering/DrawFinalPass.h

@@ -0,0 +1,38 @@
+#ifndef DrawFinalPass_h__
+#define DrawFinalPass_h__
+
+#include "IRenderer.h"
+#include "DrawFinalPassState.h"
+#include "LightCullingPass.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class DrawFinalPass
+{
+public:
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
+    ~DrawFinalPass() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+
+    void Draw(RenderQueueCollection& rq);
+
+    //Getters
+
+
+private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
+    Texture* m_WhiteTexture;
+
+    const IRenderer* m_Renderer;
+    const LightCullingPass* m_LightCullingPass;
+
+    ShaderProgram* m_ForwardPlusProgram;
+
+};
+
+#endif 

include/Engine/Rendering/DrawFinalPassState.h

@@ -0,0 +1,15 @@
+#ifndef DrawFinalPassState_h__
+#define DrawFinalPassState_h__
+
+#include "Rendering/RenderState.h"
+
+class DrawFinalPassState : public RenderState
+{
+public:
+    DrawFinalPassState();
+    ~DrawFinalPassState();
+private:
+
+};
+
+#endif

include/Engine/Rendering/LightCullingPass.h

@@ -0,0 +1,78 @@
+#ifndef LightCullingPass_h__
+#define LightCullingPass_h__
+
+#define TILE_SIZE 16 
+#define NUM_LIGHTS 1000
+
+#include "IRenderer.h"
+#include "LightCullingPassState.h"
+#include "ShaderProgram.h"
+
+
+class LightCullingPass
+{
+public:
+    LightCullingPass(IRenderer* renderer);
+    ~LightCullingPass();
+
+    void GenerateNewFrustum();
+    void CullLights();
+    void FillLightList(RenderQueueCollection& rq);
+
+    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
+
+    //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;
+    };
+    std::vector<PointLight> m_PointLights;
+
+    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
+};
+
+
+#endif

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/RenderQueue.h

@@ -82,11 +82,12 @@ struct SpriteJob : RenderJob
 
 struct PointLightJob : RenderJob
 {
-	glm::vec3 Position;
-	glm::vec3 SpecularColor = glm::vec3(1, 1, 1);
-	glm::vec3 DiffuseColor = glm::vec3(1, 1, 1);
-	float Radius = 1.f;
-    float Intensity = 0.8f;
+    glm::vec4 Position;
+	glm::vec4 Color;
+	float Radius;
+    float Intensity;
+    float Falloff;
+    float padding = 123;
 
 	void CalculateHash() override
 	{

include/Engine/Rendering/Renderer.h

@@ -13,19 +13,8 @@
 #include "PickingPass.h"
 #include "DrawScenePass.h"
 #include "DebugCameraInputController.h"
-
-
-#define TILE_SIZE 16 
-#define NUM_LIGHTS 3
-
-
-enum lightType 
-{
-    Point,
-    Spot,
-    Directional,
-    Area
-};
+#include "LightCullingPass.h"
+#include "DrawFinalPass.h"
 
 #include "../Core/EventBroker.h"
 #include "EPicking.h"
@@ -58,70 +47,24 @@ private:
 
     DrawScenePass* m_DrawScenePass;
     PickingPass* m_PickingPass;
+    LightCullingPass* m_LightCullingPass;
     ImGuiRenderPass* m_ImGuiRenderPass;
+    DrawFinalPass* m_DrawFinalPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
     void InitializeShaders();
     void InitializeTextures();
-    void InitializeSSBOs();
     void InitializeRenderPasses();
     //TODO: Renderer: Get InputUpdate out of renderer
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     void DrawScreenQuad(GLuint textureToDraw);
 
-    //----------------------Forward+-----------------------//
-    void CalculateFrustum();
-    void CullLights();
-    //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 {
-        int Amount;
-        int Start;
-        glm::vec2 Padding;
-    };
-    LightGrid m_LightGrid[80*45];
-
-    int m_LightOffset = 0;
-
-    int m_LightIndex[80*45*200];
-
-    //-------------------------SSBO------------------------//
-    GLuint m_FrustumSSBO = 0;
-    GLuint m_LightSSBO = 1;
-    GLuint m_LightGridSSBO = 2;
-    GLuint m_LightOffsetSSBO = 3;
-    GLuint m_LightIndexSSBO = 4;
-
     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;
-
 };
 
 #endif