From 5b415937c6c7097373bfd754b5699a9946c2cd16 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 23 Nov 2022 17:53:32 +0000 Subject: Support setting a viewPort uniform for those shaders which need it --- gfx/gl/sceneShader.cpp | 17 +++++++++++++++++ gfx/gl/sceneShader.h | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'gfx/gl') diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp index b20b1db..0b0c530 100644 --- a/gfx/gl/sceneShader.cpp +++ b/gfx/gl/sceneShader.cpp @@ -24,6 +24,14 @@ SceneShader::setViewProjection(const glm::mat4 & viewProjection) const } } +void +SceneShader::setViewPort(const glm::ivec4 & viewPort) const +{ + for (const auto & prog : std::array {&basic, &water, &landmass, &absolute}) { + prog->setViewPort(viewPort); + } +} + void SceneShader::SceneProgram::setViewProjection(const glm::mat4 & viewProjection) const { @@ -31,6 +39,15 @@ SceneShader::SceneProgram::setViewProjection(const glm::mat4 & viewProjection) c glUniformMatrix4fv(viewProjectionLoc, 1, GL_FALSE, glm::value_ptr(viewProjection)); } +void +SceneShader::SceneProgram::setViewPort(const glm::ivec4 & viewPort) const +{ + if (viewPortLoc >= 0) { + glUseProgram(*this); + glUniform4iv(viewPortLoc, 1, glm::value_ptr(viewPort)); + } +} + SceneShader::BasicProgram::BasicProgram() : SceneProgram {basicShader_vs, basicShader_fs}, modelLoc {*this, "model"} { } void diff --git a/gfx/gl/sceneShader.h b/gfx/gl/sceneShader.h index 8094e0a..99431f1 100644 --- a/gfx/gl/sceneShader.h +++ b/gfx/gl/sceneShader.h @@ -8,14 +8,17 @@ class SceneShader { class SceneProgram : public Program { public: template - inline SceneProgram(const S &... srcs) : Program {srcs...}, viewProjectionLoc {*this, "viewProjection"} + inline SceneProgram(const S &... srcs) : + Program {srcs...}, viewProjectionLoc {*this, "viewProjection"}, viewPortLoc {*this, "viewPort"} { } void setViewProjection(const glm::mat4 &) const; + void setViewPort(const glm::ivec4 &) const; private: RequiredUniformLocation viewProjectionLoc; + UniformLocation viewPortLoc; }; class BasicProgram : public SceneProgram { @@ -52,4 +55,5 @@ public: AbsolutePosProgram landmass, absolute; void setViewProjection(const glm::mat4 & viewProjection) const; + void setViewPort(const glm::ivec4 & viewPort) const; }; -- cgit v1.2.3