riyyi/inferno
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change shader parameter names

Browse Source
This commit is contained in:
Riyyi
2020-12-30 12:10:49 +01:00
parent 9aee7e391d
commit 154edd8ef5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inferno/src/inferno/render/shader.cpp
+4 -4
View File
@@ -48,18 +48,18 @@ namespace Inferno {
glUniform1i(location, value);
}
void Shader::setFloat(const std::string &name, float f1) const
void Shader::setFloat(const std::string &name, float value) const
{
// Set uniform float
GLint location = glGetUniformLocation(m_program, name.c_str());
glUniform1f(location, f1);
glUniform1f(location, value);
}
void Shader::setFloat(const std::string &name, float f1, float f2, float f3, float f4) const
void Shader::setFloat(const std::string &name, float v1, float v2, float v3, float v4) const
{
// Set uniform vec4 data
GLint location = glGetUniformLocation(m_program, name.c_str());
glUniform4f(location, f1, f2, f3, f4);
glUniform4f(location, v1, v2, v3, v4);
}
void Shader::setFloat(const std::string &name, glm::vec2 value) const
inferno/src/inferno/render/shader.h
+7 -7
View File
@@ -17,13 +17,13 @@ namespace Inferno {
// Set uniform data
void setInt(const std::string& name, int value);
void setFloat(const std::string &name, float f1) const;
void setFloat(const std::string &name, float f1, float f2, float f3, float f4) const;
void setFloat(const std::string &name, glm::vec2 v) const;
void setFloat(const std::string &name, glm::vec3 v) const;
void setFloat(const std::string &name, glm::vec4 v) const;
void setFloat(const std::string &name, glm::mat3 m) const;
void setFloat(const std::string &name, glm::mat4 m) const;
void setFloat(const std::string &name, float value) const;
void setFloat(const std::string &name, float v1, float v2, float v3, float v4) const;
void setFloat(const std::string &name, glm::vec2 value) const;
void setFloat(const std::string &name, glm::vec3 value) const;
void setFloat(const std::string &name, glm::vec4 value) const;
void setFloat(const std::string &name, glm::mat3 matrix) const;
void setFloat(const std::string &name, glm::mat4 matrix) const;
// -----------------------------------------