From f2d61fc06387ccb22ecb5cb6c42210736ac64c9f Mon Sep 17 00:00:00 2001 From: Sebastian Park Date: Tue, 23 Apr 2024 00:30:37 -0400 Subject: Get ground textures working, but not yet abstracted to the shape class. --- src/graphics/shape.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/graphics/shape.cpp') diff --git a/src/graphics/shape.cpp b/src/graphics/shape.cpp index c5dde0d..824a012 100644 --- a/src/graphics/shape.cpp +++ b/src/graphics/shape.cpp @@ -127,12 +127,12 @@ void Shape::draw(Shader *shader, GLenum mode) shader->setUniform("blue", m_blue); shader->setUniform("alpha", m_alpha); glBindVertexArray(m_surfaceVao); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, ocean_floor_texture); - shader->setUniform("sampler", 1); +// glActiveTexture(GL_TEXTURE0); +// glBindTexture(GL_TEXTURE_2D, ocean_floor_texture); +// shader->setUniform("sampler", 0); glDrawElements(mode, m_numSurfaceVertices, GL_UNSIGNED_INT, reinterpret_cast(0)); glBindVertexArray(0); - glBindTexture(GL_TEXTURE_2D, 0); +// glBindTexture(GL_TEXTURE_2D, 0); break; } case GL_POINTS: -- cgit v1.2.3-70-g09d2