ShaderProgram is now a Resource.

All shaderprograms are now pointers and loaded with Resourcemanager.

include/Engine/Rendering/DrawScenePass.h

@@ -29,7 +29,7 @@ private:
 
     const IRenderer* m_Renderer;
 
-    ShaderProgram m_BasicForwardProgram;
+    ShaderProgram* m_BasicForwardProgram;
 
 };
 

include/Engine/Rendering/PickingPass.h

@@ -22,7 +22,7 @@ public:
 
 
     //Getters
-    const ShaderProgram& PickingProgram() const { return m_PickingProgram; }
+    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; }
@@ -36,7 +36,7 @@ private:
 
     const IRenderer* m_Renderer;
 
-    ShaderProgram m_PickingProgram;
+    ShaderProgram* m_PickingProgram;
 
     std::unordered_map<glm::vec2, EntityID> m_PickingColorsToEntity;
 

include/Engine/Rendering/Renderer.h

@@ -114,10 +114,10 @@ private:
 
     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_BasicForwardProgram;
+    ShaderProgram* m_DrawScreenQuadProgram;
+    ShaderProgram* m_CalculateFrustumProgram;
+    ShaderProgram* m_LightCullProgram;
 
 };
 

include/Engine/Rendering/ShaderProgram.h

@@ -3,6 +3,7 @@
 
 #include "../Common.h"
 #include "../OpenGL.h"
+#include "../Core/ResourceManager.h"
 #include <fstream>
 
 class Shader
@@ -62,11 +63,13 @@ public:
 		: ShaderType(fileName) { }
 };
 
-class ShaderProgram
+class ShaderProgram : public Resource
 {
-public:
-	ShaderProgram()
+    friend class ResourceManager;
+private:
+	ShaderProgram(std::string)
 		: m_ShaderProgramHandle(0) { }
+public:
 	~ShaderProgram();
 
 	void AddShader(std::shared_ptr<Shader> shader);

src/Engine/Rendering/DrawScenePass.cpp

@@ -15,10 +15,14 @@ void DrawScenePass::InitializeTextures()
 void DrawScenePass::InitializeShaderPrograms()
 {
     //Gör så att shaders är en resource, tex som texture classen. Konstruktorn måste vara privat.
-    m_BasicForwardProgram.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/BasicForward.vert.glsl")));
-    m_BasicForwardProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/BasicForward.frag.glsl")));
-    m_BasicForwardProgram.Compile();
-    m_BasicForwardProgram.Link();
+    m_BasicForwardProgram = ResourceManager::Load<ShaderProgram>("#BasicForwardProgram");
+
+    m_BasicForwardProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/BasicForward.vert.glsl")));
+    m_BasicForwardProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/BasicForward.frag.glsl")));
+    m_BasicForwardProgram->Compile();
+    m_BasicForwardProgram->Link();
+
+
 }
 
 void DrawScenePass::Draw(RenderQueueCollection& rq)
@@ -33,9 +37,9 @@ void DrawScenePass::Draw(RenderQueueCollection& rq)
     for (auto &job : rq.Forward) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
         if (modelJob) {
-            GLuint ShaderHandle = m_BasicForwardProgram.GetHandle();
+            GLuint ShaderHandle = m_BasicForwardProgram->GetHandle();
 
-            m_BasicForwardProgram.Bind();
+            m_BasicForwardProgram->Bind();
             //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
             glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->ModelMatrix));
             glUniformMatrix4fv(glGetUniformLocation(ShaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_Renderer->Camera()->ViewMatrix()));

src/Engine/Rendering/PickingPass.cpp

@@ -34,11 +34,13 @@ void PickingPass::InitializeFrameBuffers()
 
 void PickingPass::InitializeShaderPrograms()
 {
-    m_PickingProgram.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Picking.vert.glsl")));
-    m_PickingProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Picking.frag.glsl")));
-    m_PickingProgram.Compile();
-    m_PickingProgram.BindFragDataLocation(0, "TextureFragment");
-    m_PickingProgram.Link();
+    m_PickingProgram = ResourceManager::Load<ShaderProgram>("#PickingProgram");
+
+    m_PickingProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Picking.vert.glsl")));
+    m_PickingProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Picking.frag.glsl")));
+    m_PickingProgram->Compile();
+    m_PickingProgram->BindFragDataLocation(0, "TextureFragment");
+    m_PickingProgram->Link();
 }
 
 void PickingPass::Draw(RenderQueueCollection& rq)
@@ -50,8 +52,8 @@ void PickingPass::Draw(RenderQueueCollection& rq)
     int g = 0;
     //TODO: Render: Add code for more jobs than modeljobs.
 
-    GLuint ShaderHandle = m_PickingProgram.GetHandle();
-    m_PickingProgram.Bind();
+    GLuint ShaderHandle = m_PickingProgram->GetHandle();
+    m_PickingProgram->Bind();
 
     for (auto &job : rq.Forward) {
         auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);

src/Engine/Rendering/Renderer.cpp

@@ -66,15 +66,14 @@ void Renderer::InitializeWindow()
 
 void Renderer::InitializeShaders()
 {
-	m_BasicForwardProgram.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/BasicForward.vert.glsl")));
-	m_BasicForwardProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/BasicForward.frag.glsl")));
-	m_BasicForwardProgram.Compile();
-	m_BasicForwardProgram.Link();
+    m_BasicForwardProgram = ResourceManager::Load<ShaderProgram>("#m_BasicForwardProgram");
 
-    m_DrawScreenQuadProgram.AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/DrawScreenQuad.vert.glsl")));
-    m_DrawScreenQuadProgram.AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/DrawScreenQuad.frag.glsl")));
-    m_DrawScreenQuadProgram.Compile();
-    m_DrawScreenQuadProgram.Link();
+    m_DrawScreenQuadProgram = ResourceManager::Load<ShaderProgram>("#DrawScreenQuadProgram");
+
+    m_DrawScreenQuadProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/DrawScreenQuad.vert.glsl")));
+    m_DrawScreenQuadProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/DrawScreenQuad.frag.glsl")));
+    m_DrawScreenQuadProgram->Compile();
+    m_DrawScreenQuadProgram->Link();
 
     //m_CalculateFrustumProgram.AddShader(std::shared_ptr<Shader>(new ComputeShader("Shaders/GridFrustum.comp.glsl")));
     //m_CalculateFrustumProgram.Compile();
@@ -218,7 +217,7 @@ void Renderer::DrawScreenQuad(GLuint textureToDraw)
     glClear(GL_COLOR_BUFFER_BIT);
 
 
-    m_DrawScreenQuadProgram.Bind();
+    m_DrawScreenQuadProgram->Bind();
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, textureToDraw);
 
@@ -314,14 +313,14 @@ void Renderer::InitializeRenderPasses()
 void Renderer::CalculateFrustum()
 {
     GLERROR("CalculateFrustum Error-1");
-    m_CalculateFrustumProgram.Bind();
+    m_CalculateFrustumProgram->Bind();
     
     GLERROR("CalculateFrustum Error1");
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
     GLERROR("CalculateFrustum Error2");
-    glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram.GetHandle(), "P"), 1, false, glm::value_ptr(m_Camera->ProjectionMatrix()));
+    glUniformMatrix4fv(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "P"), 1, false, glm::value_ptr(m_Camera->ProjectionMatrix()));
     GLERROR("CalculateFrustum Error3");
-    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram.GetHandle(), "ScreenDimensions"), m_Resolution.Width, m_Resolution.Height);
+    glUniform2f(glGetUniformLocation(m_CalculateFrustumProgram->GetHandle(), "ScreenDimensions"), m_Resolution.Width, m_Resolution.Height);
     GLERROR("CalculateFrustum Error4");
     glDispatchCompute(5, 3, 1);
     GLERROR("CalculateFrustum Error5");
@@ -338,7 +337,7 @@ void Renderer::TEMPCreateLights()
 
 void Renderer::CullLights()
 {
-    m_LightCullProgram.Bind();
+    m_LightCullProgram->Bind();
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, m_FrustumSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, m_LightSSBO);
     glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightGridSSBO);

src/Game/Game.cpp

@@ -6,6 +6,7 @@ Game::Game(int argc, char* argv[])
 	ResourceManager::RegisterType<Model>("Model");
 	ResourceManager::RegisterType<Texture>("Texture");
     ResourceManager::RegisterType<EntityXMLFile>("EntityXMLFile");
+    ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
 
 	m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
 	LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));