summaryrefslogtreecommitdiff
path: root/src/graphics/shape.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics/shape.cpp')
-rw-r--r--src/graphics/shape.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics/shape.cpp b/src/graphics/shape.cpp
index fb0178f..e3612e5 100644
--- a/src/graphics/shape.cpp
+++ b/src/graphics/shape.cpp
@@ -363,11 +363,11 @@ void Shape::initGroundPlane(std::string texturePath, float depth, Shader* shader
// // TASK 10: set the texture.frag uniform for our texture
shader->bind();
- shader->setUniform("sampler", 0);
+ shader->setUniform("groundSampler", 0);
shader->unbind();
}
-void Shape::initSkyPlane(std::string texturePath, float depth, Shader* shader) {
+void Shape::initSkyPlane(std::string texturePath, float height, Shader* shader) {
//TODO: Complete
QString ground_texture_filepath = QString(texturePath.c_str());
@@ -401,7 +401,7 @@ void Shape::initSkyPlane(std::string texturePath, float depth, Shader* shader) {
// // TASK 10: set the texture.frag uniform for our texture
shader->bind();
- shader->setUniform("sampler", 1);
+ shader->setUniform("skySampler", 1);
shader->unbind();
}