X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=8fbff622b06ec1440851b33cdd69aeda1f46d0b8;hp=caaa2a308a507aec6985488c622b371fc12c05b4;hb=9e43c799021b7bcca324b988aae44e98b05d10b4;hpb=a03f2bc751bbd7f91cbc2f52d2f0f6e753d6f776 diff --git a/main.cpp b/main.cpp index caaa2a3..8fbff62 100644 --- a/main.cpp +++ b/main.cpp @@ -161,10 +161,14 @@ void display() { glActiveTexture(GL_TEXTURE3); glBindTexture(GL_TEXTURE_2D, roughnessMap); - glUniform1i(glGetUniformLocation(pbrProg->progId, "aoMap"), 3); + glUniform1i(glGetUniformLocation(pbrProg->progId, "aoMap"), 4); glActiveTexture(GL_TEXTURE4); glBindTexture(GL_TEXTURE_2D, aoMap); + glUniform1i(glGetUniformLocation(pbrProg->progId, "irradianceMap"), 5); + glActiveTexture(GL_TEXTURE5); + glBindTexture(GL_TEXTURE_CUBE_MAP, skybox->getIrradianceMap()); + pbr->draw(); for (Light &light: lights) drawLight(light);