lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #205 from NicholasBlaskey/master

Browse Source 
Changed some incorrect comments regarding where the metallic/roughnes…
This commit is contained in:
Joey de Vries
2020-10-12 10:09:27 +02:00
committed by GitHub
parent b6da46b9f3 03c814d403
commit d444d98da7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/6.pbr/2.1.1.ibl_irradiance_conversion/ibl_irradiance_conversion.cpp
View File

@@ -234,7 +234,7 @@ int main()
pbrShader.setMat4("view", view); pbrShader.setMat4("view", view);
pbrShader.setVec3("camPos", camera.Position); pbrShader.setVec3("camPos", camera.Position);
// render rows*column number of spheres with material properties defined by textures (they all have the same material properties) // render rows*column number of spheres with varying metallic/roughness values scaled by rows and columns respectively
glm::mat4 model = glm::mat4(1.0f); glm::mat4 model = glm::mat4(1.0f);
for (int row = 0; row < nrRows; ++row) for (int row = 0; row < nrRows; ++row)
{ {

2
src/6.pbr/2.1.2.ibl_irradiance/ibl_irradiance.cpp
View File

@@ -279,7 +279,7 @@ int main()
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_CUBE_MAP, irradianceMap); glBindTexture(GL_TEXTURE_CUBE_MAP, irradianceMap);
// render rows*column number of spheres with material properties defined by textures (they all have the same material properties) // render rows*column number of spheres with varying metallic/roughness values scaled by rows and columns respectively
glm::mat4 model = glm::mat4(1.0f); glm::mat4 model = glm::mat4(1.0f);
for (int row = 0; row < nrRows; ++row) for (int row = 0; row < nrRows; ++row)
{ {

2
src/6.pbr/2.2.1.ibl_specular/ibl_specular.cpp
View File

@@ -371,7 +371,7 @@ int main()
glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, brdfLUTTexture); glBindTexture(GL_TEXTURE_2D, brdfLUTTexture);
// render rows*column number of spheres with material properties defined by textures (they all have the same material properties) // render rows*column number of spheres with varying metallic/roughness values scaled by rows and columns respectively
glm::mat4 model = glm::mat4(1.0f); glm::mat4 model = glm::mat4(1.0f);
for (int row = 0; row < nrRows; ++row) for (int row = 0; row < nrRows; ++row)
{ {