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);