Added GenerateTexture, GenerateMipMapTexture and DeleteTexture to CommonFunctions

include/Engine/Rendering/DrawBloomPass.h

@@ -39,8 +39,6 @@ public:
 
 
 private:
-    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-
     Texture* m_BlackTexture;
     Model* m_ScreenQuad;
 

include/Engine/Rendering/DrawFinalPass.h

@@ -35,9 +35,6 @@ public:
     FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
 private:
-    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-    void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
-
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);

include/Engine/Rendering/FrameBuffer.h

@@ -33,6 +33,15 @@ public:
     ~Texture2D();
 };
 
+class Texture2DMultiSample : public ResourceType<GL_TEXTURE_2D_MULTISAMPLE>
+{
+public:
+	Texture2DMultiSample(GLuint* resourceHandle, GLenum attachment)
+		: ResourceType(resourceHandle, attachment) { };
+
+	~Texture2DMultiSample();
+};
+
 class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:

include/Engine/Rendering/IRenderer.h

@@ -11,6 +11,7 @@
 #include "RenderQueue.h"
 #include "Model.h"
 #include "../Core/World.h" //So temp
+#include "Util/CommonFunctions.h"
 
 
 struct PickData

include/Engine/Rendering/SSAOPass.h

@@ -46,8 +46,6 @@ private:
 	void InitializeShaderProgram();
 	void InitializeBuffer();
 
-	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-
 	//void blurHorizontal(GLuint depthBuffer);
 	//void blurVertical(GLuint depthBuffer);
 

include/Engine/Rendering/Util/CommonFunctions.h

@@ -9,6 +9,9 @@
 namespace CommonFunctions
 { 
 Texture* LoadTexture(std::string path, bool threaded);
+void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
+void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps);
+void DeleteTexture(GLuint* texture);
 };
 
 #endif