lauchmelder/lol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

massive rewrite

Browse source
This commit is contained in:
Lauchmelder 2021-12-24 14:20:53 +01:00
parent 4c1c151422
commit 5811d3676a
18 changed files with 442 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Shader.cpp
View file

@ -11,7 +11,7 @@ inline
namespace lol
{
UniqueShader::UniqueShader(const std::string& vertexShader, const std::string& fragmentShader) :
Shader::Shader(const std::string& vertexShader, const std::string& fragmentShader) :
id(0)
{
GLint success;
@ -71,17 +71,22 @@ namespace lol
glDeleteShader(vertexShaderID);
}
UniqueShader::~UniqueShader()
Shader::~Shader()
{
glDeleteProgram(id);
}
void UniqueShader::Use()
void Shader::Bind()
{
glUseProgram(id);
}
void UniqueShader::SetUniform(const std::string& name, const glm::mat4& value)
void Shader::Unbind()
{
glUseProgram(0);
}
void Shader::SetUniform(const std::string& name, const glm::mat4& value)
{
GLint location = glGetUniformLocation(id, name.c_str());
if (location == -1)
@ -90,7 +95,7 @@ namespace lol
glUniformMatrix4fv(location, 1, GL_FALSE, glm::value_ptr(value));
}
void UniqueShader::SetUniform(const std::string& name, const glm::vec4& value)
void Shader::SetUniform(const std::string& name, const glm::vec4& value)
{
GLint location = glGetUniformLocation(id, name.c_str());
if (location == -1)