History

Batch heightfield sections for better performance.

Andrzej Kapolka committed 11 years ago

Commit da857141 parent 53809804 files · +298 −138Browse files

Showing the changes to interface/src/renderer/ProgramObject.cpp (1 of 4 files). Show all

Unified · Split

interface/src/renderer/ProgramObject.cpp+16−0
@@ -15,6 +15,14 @@ · 14 unmodified lines
1515 ProgramObject::ProgramObject(QObject* parent) : QGLShaderProgram(parent) {
1616 }
1717
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+
1826 void ProgramObject::setUniform(int location, const glm::vec3& value) {
1927 setUniformValue(location, value.x, value.y, value.z);
2028 }
@@ -23,6 +31,14 @@ void ProgramObject::setUniform(const char* name, const glm::vec3& value) { · 2 unmodified lines
2331 setUniformValue(name, value.x, value.y, value.z);
2432 }
2533
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+
2642 void ProgramObject::setUniformArray(const char* name, const glm::vec3* values, int count) {
2743 GLfloat* floatVal = new GLfloat[count*3];
2844 int index = 0;