X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fshader.cpp;fp=src%2Fgraphics%2Fshader.cpp;h=98da25ab348fb7210ac66eb774c6909eb30d39d7;hb=e821b85cf13376b11d125bdf5da4f16b20acf2e2;hp=62a9c631a1057991899c9f511d78ddd6eb341c28;hpb=8ab4ea13545cccbacbd1ed610968d3f481c1b3c8;p=blank.git

diff --git a/src/graphics/shader.cpp b/src/graphics/shader.cpp
index 62a9c63..98da25a 100644
--- a/src/graphics/shader.cpp
+++ b/src/graphics/shader.cpp
@@ -499,22 +499,18 @@ void BlendedSprite::SetBG(const glm::vec4 &v) noexcept {
 SkyBoxShader::SkyBoxShader()
 : program()
 , vp(1.0f)
-, m_handle(0)
-, mv_handle(0)
-, mvp_handle(0)
+, vp_handle(0)
 , sampler_handle(0) {
 	program.LoadShader(
 		GL_VERTEX_SHADER,
 		"#version 330 core\n"
 		"layout(location = 0) in vec3 vtx_position;\n"
-		"uniform mat4 M;\n"
-		"uniform mat4 MV;\n"
-		"uniform mat4 MVP;\n"
+		"uniform mat4 VP;\n"
 		"out vec3 vtx_viewspace;\n"
 		"void main() {\n"
-			"gl_Position = MVP * vec4(vtx_position, 1);\n"
+			"gl_Position = VP * vec4(vtx_position, 1);\n"
 			"gl_Position.z = gl_Position.w;\n"
-			"vtx_viewspace = (MV * vec4(vtx_position, 1)).xyz;\n"
+			"vtx_viewspace = vtx_position;\n"
 		"}\n"
 	);
 	program.LoadShader(
@@ -533,9 +529,7 @@ SkyBoxShader::SkyBoxShader()
 		throw std::runtime_error("link program");
 	}
 
-	m_handle = program.UniformLocation("M");
-	mv_handle = program.UniformLocation("MV");
-	mvp_handle = program.UniformLocation("MVP");
+	vp_handle = program.UniformLocation("VP");
 	sampler_handle = program.UniformLocation("tex_sampler");
 }
 
@@ -544,17 +538,6 @@ void SkyBoxShader::Activate() noexcept {
 	program.Use();
 }
 
-void SkyBoxShader::SetM(const glm::mat4 &M) noexcept {
-	glm::mat4 m(M);
-	m[0].w = 0.0f;
-	m[1].w = 0.0f;
-	m[2].w = 0.0f;
-	m[3] = { 0.0f, 0.0f, 0.0f, 1.0f };
-	program.Uniform(m_handle, m);
-	program.Uniform(mv_handle, view * m);
-	program.Uniform(mvp_handle, vp * m);
-}
-
 void SkyBoxShader::SetTexture(CubeMap &tex) noexcept {
 	glActiveTexture(GL_TEXTURE0);
 	tex.Bind();
@@ -564,6 +547,7 @@ void SkyBoxShader::SetTexture(CubeMap &tex) noexcept {
 void SkyBoxShader::SetProjection(const glm::mat4 &p) noexcept {
 	projection = p;
 	vp = p * view;
+	program.Uniform(vp_handle, vp);
 }
 
 void SkyBoxShader::SetView(const glm::mat4 &v) noexcept {
@@ -571,8 +555,9 @@ void SkyBoxShader::SetView(const glm::mat4 &v) noexcept {
 	view[0].w = 0.0f;
 	view[1].w = 0.0f;
 	view[2].w = 0.0f;
-	view[3] = { 0.0f, 0.0f, 0.0f, 1.0f };
+	view[3] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
 	vp = projection * v;
+	program.Uniform(vp_handle, vp);
 }
 
 void SkyBoxShader::SetVP(const glm::mat4 &v, const glm::mat4 &p) noexcept {
@@ -580,11 +565,6 @@ void SkyBoxShader::SetVP(const glm::mat4 &v, const glm::mat4 &p) noexcept {
 	SetView(v);
 }
 
-void SkyBoxShader::SetMVP(const glm::mat4 &m, const glm::mat4 &v, const glm::mat4 &p) noexcept {
-	SetVP(v, p);
-	SetM(m);
-}
-
 
 PlainColor::PlainColor()
 : program()