omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

started implementing dynamic widget allocation by xml tag

Browse Source
This commit is contained in:
omigamedev
2017-01-29 17:42:23 +00:00
parent 7436706b37
commit 16c1b6481e
10 changed files with 94 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/shader.cpp
View File

@@ -80,18 +80,18 @@ void Shader::use()
{
glUseProgram(prog);
}
void Shader::u_vec4(std::string name, const glm::vec4& v)
void Shader::u_vec4(const char* name, const glm::vec4& v)
{
auto loc = glGetUniformLocation(prog, name.c_str());
auto loc = glGetUniformLocation(prog, name);
glUniform4fv(loc, 1, glm::value_ptr(v));
}
void Shader::u_mat4(std::string name, const glm::mat4& m)
void Shader::u_mat4(const char* name, const glm::mat4& m)
{
auto loc = glGetUniformLocation(prog, name.c_str());
auto loc = glGetUniformLocation(prog, name);
glUniformMatrix4fv(loc, 1, GL_FALSE, glm::value_ptr(m));
}
void Shader::u_int(std::string name, int i)
void Shader::u_int(const char* name, int i)
{
auto loc = glGetUniformLocation(prog, name.c_str());
auto loc = glGetUniformLocation(prog, name);
glUniform1i(loc, i);
}