From 8c45cab4986f3e61c03c1f98db38f6ff2a969958 Mon Sep 17 00:00:00 2001 From: Joey de Vries Date: Fri, 2 Jun 2017 23:03:46 +0200 Subject: [PATCH] Final PBR adjustments on code/content-rework. --- src/6.pbr/1.1.lighting/1.1.pbr.vs | 2 +- src/6.pbr/1.2.lighting_textured/1.2.pbr.vs | 2 +- src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs | 3 +-- src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.vs | 2 +- src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs | 1 - src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.vs | 2 +- src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs | 1 - src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.vs | 2 +- src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs | 1 - src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs | 2 +- 10 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/6.pbr/1.1.lighting/1.1.pbr.vs b/src/6.pbr/1.1.lighting/1.1.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/1.1.lighting/1.1.pbr.vs +++ b/src/6.pbr/1.1.lighting/1.1.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0); diff --git a/src/6.pbr/1.2.lighting_textured/1.2.pbr.vs b/src/6.pbr/1.2.lighting_textured/1.2.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/1.2.lighting_textured/1.2.pbr.vs +++ b/src/6.pbr/1.2.lighting_textured/1.2.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0); diff --git a/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs b/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs index 79240dd..6c114bd 100644 --- a/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs +++ b/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs @@ -8,7 +8,6 @@ uniform mat4 view; void main() { - WorldPos = aPos; - + WorldPos = aPos; gl_Position = projection * view * vec4(WorldPos, 1.0); } \ No newline at end of file diff --git a/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.vs b/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.vs +++ b/src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0); diff --git a/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs b/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs index 79240dd..a022916 100644 --- a/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs +++ b/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs @@ -9,6 +9,5 @@ uniform mat4 view; void main() { WorldPos = aPos; - gl_Position = projection * view * vec4(WorldPos, 1.0); } \ No newline at end of file diff --git a/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.vs b/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.vs +++ b/src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0); diff --git a/src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs b/src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs index 79240dd..a022916 100644 --- a/src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs +++ b/src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs @@ -9,6 +9,5 @@ uniform mat4 view; void main() { WorldPos = aPos; - gl_Position = projection * view * vec4(WorldPos, 1.0); } \ No newline at end of file diff --git a/src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.vs b/src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.vs +++ b/src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0); diff --git a/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs b/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs index 79240dd..a022916 100644 --- a/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs +++ b/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs @@ -9,6 +9,5 @@ uniform mat4 view; void main() { WorldPos = aPos; - gl_Position = projection * view * vec4(WorldPos, 1.0); } \ No newline at end of file diff --git a/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs b/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs index 0f000c2..e644885 100644 --- a/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs +++ b/src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs @@ -14,7 +14,7 @@ uniform mat4 model; void main() { TexCoords = aTexCoords; - WorldPos = vec3(model * vec4(aPos, 1.0f)); + WorldPos = vec3(model * vec4(aPos, 1.0)); Normal = mat3(model) * aNormal; gl_Position = projection * view * vec4(WorldPos, 1.0);