Showing the changes to interface/src/renderer/ProgramObject.cpp (1 of 4 files). Show all
Unified · Split
| @@ -15,6 +15,14 @@ · 14 unmodified lines | |||
| 15 | ProgramObject::ProgramObject(QObject* parent) : QGLShaderProgram(parent) { | 15 | ProgramObject::ProgramObject(QObject* parent) : QGLShaderProgram(parent) { |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | void ProgramObject::setUniform(int location, const glm::vec2& value) { | ||
| 19 | setUniformValue(location, value.x, value.y); | ||
| 20 | } | ||
| 21 | |||
| 22 | void ProgramObject::setUniform(const char* name, const glm::vec2& value) { | ||
| 23 | setUniformValue(name, value.x, value.y); | ||
| 24 | } | ||
| 25 | |||
| 18 | void ProgramObject::setUniform(int location, const glm::vec3& value) { | 26 | void ProgramObject::setUniform(int location, const glm::vec3& value) { |
| 19 | setUniformValue(location, value.x, value.y, value.z); | 27 | setUniformValue(location, value.x, value.y, value.z); |
| 20 | } | 28 | } |
| @@ -23,6 +31,14 @@ void ProgramObject::setUniform(const char* name, const glm::vec3& value) { · 2 unmodified lines | |||
| 23 | setUniformValue(name, value.x, value.y, value.z); | 31 | setUniformValue(name, value.x, value.y, value.z); |
| 24 | } | 32 | } |
| 25 | 33 | ||
| 34 | void ProgramObject::setUniform(int location, const glm::vec4& value) { | ||
| 35 | setUniformValue(location, value.x, value.y, value.z, value.w); | ||
| 36 | } | ||
| 37 | |||
| 38 | void ProgramObject::setUniform(const char* name, const glm::vec4& value) { | ||
| 39 | setUniformValue(name, value.x, value.y, value.z, value.w); | ||
| 40 | } | ||
| 41 | |||
| 26 | void ProgramObject::setUniformArray(const char* name, const glm::vec3* values, int count) { | 42 | void ProgramObject::setUniformArray(const char* name, const glm::vec3* values, int count) { |
| 27 | GLfloat* floatVal = new GLfloat[count*3]; | 43 | GLfloat* floatVal = new GLfloat[count*3]; |
| 28 | int index = 0; | 44 | int index = 0; |