diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics/shape.cpp | 12 | ||||
| -rw-r--r-- | src/skybox.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/graphics/shape.cpp b/src/graphics/shape.cpp index 7073a7f..e5849fb 100644 --- a/src/graphics/shape.cpp +++ b/src/graphics/shape.cpp @@ -161,12 +161,12 @@ void Shape::draw(Shader *shader, GLenum mode) // Not that one texture is overwriting the other, because if we just load sky it doesn't work // Draws whatever is bound to texture0 no matter what. // Drawing the ground texture. -/* // When ground is being rendered dynamically, don't use static ground image. - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, m_ground_texture); -// glBindTexture(GL_TEXTURE_2D, 0); - shader->setUniform("groundSampler", 0); - glUniform1i(glGetUniformLocation(shader->id(), "groundSampler"), 0);*/ + // When ground is being rendered dynamically, don't use static ground image. +// glActiveTexture(GL_TEXTURE0); +// glBindTexture(GL_TEXTURE_2D, m_ground_texture); +//// glBindTexture(GL_TEXTURE_2D, 0); +// shader->setUniform("groundSampler", 0); +// glUniform1i(glGetUniformLocation(shader->id(), "groundSampler"), 0); // https://stackoverflow.com/questions/67277087/opengl-glsl-multiple-texture-binding-not-working diff --git a/src/skybox.h b/src/skybox.h index d9995ba..abe78c9 100644 --- a/src/skybox.h +++ b/src/skybox.h @@ -202,12 +202,12 @@ public: - {":resources/images/cupertin-lake_rt.png", - ":resources/images/cupertin-lake_lf.png", - ":resources/images/cupertin-lake_up.png", - ":resources/images/cupertin-lake_dn.png", - ":resources/images/cupertin-lake_bk.png", - ":resources/images/cupertin-lake_ft.png", + {":resources/images/px.png", + ":resources/images/nx.png", + ":resources/images/py.png", + ":resources/images/ny.png", + ":resources/images/pz.png", + ":resources/images/nz.png", }; float ROTATE_SPEED = .01f; // 1 degree per sec |