sampling from the skybox, not clouds

2 files changed, 9 insertions, 4 deletions

diff --git a/src/glwidget.cpp b/src/glwidget.cpp
index cbc6971..57df286 100755
--- a/src/glwidget.cpp
+++ b/src/glwidget.cpp
@@ -425,6 +425,11 @@ void GLWidget::paintGL()
     glBindTexture(GL_TEXTURE_2D, m_fbo_texture);
     glUniform1i(glGetUniformLocation(m_defaultShader->id(), "groundSampler"), 2);
 
+    glActiveTexture(GL_TEXTURE1);
+    glBindTexture(GL_TEXTURE_CUBE_MAP, m_skybox.getSkyboxTex());
+    m_defaultShader->setUniform("skySampler", 1);
+    glUniform1i(glGetUniformLocation(m_defaultShader->id(), "skySampler"), 1);
+
     m_arap.draw(m_defaultShader, GL_TRIANGLES);
     m_defaultShader->unbind();
 
diff --git a/src/graphics/shape.cpp b/src/graphics/shape.cpp
index 874a9e6..abe4f7b 100644
--- a/src/graphics/shape.cpp
+++ b/src/graphics/shape.cpp
@@ -173,10 +173,10 @@ void Shape::draw(Shader *shader, GLenum mode)
     // FIGURED OUT THE PROBLEM. it was that SAMPLERS WERE DEFAULTING TO SLOT 0 AND SETUNIFORM WASN'T WORKING
     // BECAUSE IT WAS CALLING SETUNIFORM WITH FREAKING FLOATS. WHAT THE FRICK C++.
     // https://learnopengl.com/Getting-started/Textures
-    glActiveTexture(GL_TEXTURE1);
-    glBindTexture(GL_TEXTURE_2D, m_sky_texture);
-    shader->setUniform("skySampler", 1);
-    glUniform1i(glGetUniformLocation(shader->id(), "skySampler"), 1);
+//    glActiveTexture(GL_TEXTURE1);
+//    glBindTexture(GL_TEXTURE_2D, m_sky_texture);
+//    shader->setUniform("skySampler", 1);
+//    glUniform1i(glGetUniformLocation(shader->id(), "skySampler"), 1);
 
     Eigen::Matrix3f m3 = m_modelMatrix.topLeftCorner(3, 3);
     Eigen::Matrix3f inverseTransposeModel = m3.inverse().transpose();