PickingPass now sets state and clear it when done.

PickingState now it's own class so renderer is a bit cleaner.

include/Engine/Rendering/PickingPass.h

@@ -0,0 +1,45 @@
+#ifndef PickingPass_h__
+#define PickingPass_h__
+
+#include "IRenderer.h"
+#include "PickingPassState.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "Util/UnorderedMapVec2.h"
+
+class PickingPass
+{
+public:
+    PickingPass(IRenderer* renderer);
+    ~PickingPass();
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+
+    void Draw(RenderQueueCollection& rq);
+
+
+    //Getters
+    const ShaderProgram& PickingProgram() const { return m_PickingProgram; }
+    const std::unordered_map<glm::vec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
+    GLuint PickingTexture() const { return m_PickingTexture; }
+    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;
+
+    const IRenderer* m_Renderer;
+
+    ShaderProgram m_PickingProgram;
+
+    std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
+
+    GLuint m_PickingTexture;
+    GLuint m_DepthBuffer;
+
+    FrameBuffer m_PickingBuffer;
+};
+
+#endif 

include/Engine/Rendering/Renderer.h

@@ -10,6 +10,8 @@
 #include "Util/UnorderedMapVec2.h"
 #include "FrameBuffer.h"
 #include "../Core/World.h"
+#include "PickingPass.h"
+
 
 #define TILE_SIZE 16 
 #define NUM_LIGHTS 3
@@ -35,17 +37,12 @@ private:
     Texture* m_ErrorTexture;
     Texture* m_WhiteTexture;
     float m_CameraMoveSpeed;
-    FrameBuffer m_PickingBuffer;
-    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer;
 
     Model* m_ScreenQuad;
     Model* m_UnitQuad;
     Model* m_UnitSphere;
 
-
-
-    std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
+    PickingPass* m_PickingPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
@@ -53,9 +50,10 @@ private:
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeSSBOs();
+    void InitializeRenderPasses();
     //TODO: Renderer: Get InputUpdate out of renderer
     void InputUpdate(double dt);
-    void PickingPass(RenderQueueCollection& rq);
+    //void PickingPass(RenderQueueCollection& rq);
     void DrawScreenQuad(GLuint textureToDraw);
     void DrawScene(RenderQueueCollection& rq);
 
@@ -106,7 +104,6 @@ private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 	//--------------------ShaderPrograms-------------------//
 	ShaderProgram m_BasicForwardProgram;
-    ShaderProgram m_PickingProgram;
     ShaderProgram m_DrawScreenQuadProgram;
     ShaderProgram m_CalculateFrustumProgram;
     ShaderProgram m_LightCullProgram;

include/Engine/Rendering/ShaderProgram.h

@@ -1,3 +1,5 @@
+#ifndef ShaderProgram_h__
+#define ShaderProgram_h__
 
 #include "../Common.h"
 #include "../OpenGL.h"
@@ -79,3 +81,5 @@ private:
 	GLuint m_ShaderProgramHandle;
 	std::vector<std::shared_ptr<Shader>> m_Shaders;
 };
+
+#endif

include/Engine/Rendering/Util/GLError.h

@@ -9,7 +9,7 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	GLenum error = glGetError();
 	if (error != GL_NO_ERROR)
 	{
-		_LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s %i %s", info, error, gluErrorString(error));
+		_LOG(LOG_LEVEL_ERROR, file, func, line, "GL Error: %s, %i, %s", info, error, gluErrorString(error));
 		return true;
 	}