projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement IBL diffuse part
[opengl.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index caaa2a308a507aec6985488c622b371fc12c05b4..8fbff622b06ec1440851b33cdd69aeda1f46d0b8 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-161,10
+161,14
@@
void display() {
glActiveTexture(GL_TEXTURE3);
glBindTexture(GL_TEXTURE_2D, roughnessMap);
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);
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);
pbr->draw();
for (Light &light: lights) drawLight(light);