Merge pull request #35 from cortex-command-community/glm.hpp

Reduce inclusion of glm.hpp

Author: Causeless

Source/Managers/PostProcessMan.cpp

@@ -126,7 +126,7 @@ void PostProcessMan::CreateGLBackBuffers() {
 	glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	UpdatePalette();
 	glActiveTexture(GL_TEXTURE0);
-	m_ProjectionMatrix = glm::ortho(0.0F, static_cast<float>(g_FrameMan.GetBackBuffer8()->w), 0.0F, static_cast<float>(g_FrameMan.GetBackBuffer8()->h), -1.0F, 1.0F);
+	m_ProjectionMatrix = std::make_unique<glm::mat4>(glm::ortho(0.0F, static_cast<float>(g_FrameMan.GetBackBuffer8()->w), 0.0F, static_cast<float>(g_FrameMan.GetBackBuffer8()->h), -1.0F, 1.0F));
 }
 
 void PostProcessMan::UpdatePalette() {
@@ -457,7 +457,7 @@ void PostProcessMan::DrawDotGlowEffects() {
 					transformMatrix = glm::translate(transformMatrix, glm::vec3(x + 0.5f, y + 0.5f, 0));
 					transformMatrix = glm::scale(transformMatrix, glm::vec3(m_YellowGlow->w * 0.5f, m_YellowGlow->h * 0.5f, 1.0));
 					m_PostProcessShader->SetInt(m_PostProcessShader->GetTextureUniform(), 0);
-					m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetProjectionUniform(), m_ProjectionMatrix);
+					m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetProjectionUniform(), *m_ProjectionMatrix);
 					m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetTransformUniform(), transformMatrix);
 					GL_CHECK(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
 				}
@@ -487,7 +487,7 @@ void PostProcessMan::DrawPostScreenEffects() {
 	glBindVertexArray(m_VertexArray);
 	m_PostProcessShader->Use();
 	m_PostProcessShader->SetInt(m_PostProcessShader->GetTextureUniform(), 0);
-	m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetProjectionUniform(), m_ProjectionMatrix);
+	m_PostProcessShader->SetMatrix4f(m_PostProcessShader->GetProjectionUniform(), *m_ProjectionMatrix);
 
 	for (const PostEffect& postEffect: m_PostScreenEffects) {
 		if (postEffect.m_Bitmap) {

Source/Managers/PostProcessMan.h

@@ -2,13 +2,14 @@
 
 #include "Singleton.h"
 #include "Box.h"
-#include "SceneMan.h"
 #include "glad/gl.h"
-#include <glm/glm.hpp>
+#include "glm/fwd.hpp"
+#include "SceneMan.h"
 #include "Shader.h"
 
 #include <array>
 #include <atomic>
+#include <memory>
 #include <list>
 #include <vector>
 
@@ -184,7 +185,7 @@ namespace RTE {
 		GLuint m_BlitFramebuffer; //!< Framebuffer for blitting the 8bpp backbuffer to the 32bpp backbuffer.
 		GLuint m_PostProcessFramebuffer; //!< Framebuffer for post-processing effects.
 		GLuint m_PostProcessDepthBuffer; //!< Depth buffer for post-processing effects.
-		glm::mat4 m_ProjectionMatrix; //!< Projection matrix for post-processing effects.
+		std::unique_ptr<glm::mat4> m_ProjectionMatrix; //!< Projection matrix for post-processing effects.
 		GLuint m_VertexBuffer; //!< Vertex buffer for post-processing effects.
 		GLuint m_VertexArray; //!< Vertex array for post-processing effects.
 		std::unique_ptr<Shader> m_Blit8; //!< Shader for blitting the 8bpp backbuffer to the 32bpp backbuffer.

Source/Managers/WindowMan.cpp

@@ -37,7 +37,6 @@ void WindowMan::Clear() {
 
 	m_PrimaryWindow.reset();
 	m_BackBuffer32Texture = 0;
-	m_PrimaryWindowProjection = glm::mat4(1);
 	m_ScreenVAO = 0;
 	m_ScreenVBO = 0;
 	ClearMultiDisplayData();

Source/Managers/WindowMan.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Singleton.h"
-#include "System/Shader.h"
+#include "glm/fwd.hpp"
 #include "glad/gl.h"
 
 #include <memory>
@@ -191,7 +191,6 @@ namespace RTE {
 		GLuint m_BackBuffer32Texture; //!< Streaming texture for the software rendered stuff.
 		GLuint m_ScreenBufferTexture; //!< Internal backbuffer for the final blit and sceenshots, only clear immediately before drawing.
 		GLuint m_ScreenBufferFBO; //!< Framebuffer object for the screen buffer texture.
-		glm::mat4 m_PrimaryWindowProjection; //!< Projection Matrix for the main window.
 		std::unique_ptr<SDL_Rect> m_PrimaryWindowViewport; //!< Viewport for the main window.
 
 		std::vector<std::shared_ptr<SDL_Window>> m_MultiDisplayWindows; //!< Additional windows for multi-display fullscreen.

Source/System/Shader.cpp

@@ -1,5 +1,6 @@
 #include "Shader.h"
 #include "glad/gl.h"
+#include "glm/glm.hpp"
 #include "glm/gtc/type_ptr.hpp"
 #include "GLCheck.h"
 

Source/System/Shader.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Serializable.h"
-#include "glm/glm.hpp"
+#include "glm/fwd.hpp"
 
 namespace RTE {
 	class Shader {