diff options
Diffstat (limited to 'src/graphics')
-rw-r--r-- | src/graphics/shape.cpp | 6 | ||||
-rw-r--r-- | src/graphics/shape.h | 2 |
2 files changed, 4 insertions, 4 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(); } diff --git a/src/graphics/shape.h b/src/graphics/shape.h index 165fa96..b993b28 100644 --- a/src/graphics/shape.h +++ b/src/graphics/shape.h @@ -38,7 +38,7 @@ public: void setColor(float r, float g, float b); void initGroundPlane(std::string texturePath, float depth, Shader* shader); - void initSkyPlane(std::string texturePath, float depth, Shader* shader); + void initSkyPlane(std::string texturePath, float height, Shader* shader); void draw(Shader *shader, GLenum mode); SelectMode select(Shader *shader, int vertex); |