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

Final PBR adjustments on code/content-rework.

Browse Source
This commit is contained in:
Joey de Vries
2017-06-02 23:03:46 +02:00
parent 5eddf64303
commit 8c45cab498
10 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/6.pbr/1.1.lighting/1.1.pbr.vs
View File

@@ -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);

2
src/6.pbr/1.2.lighting_textured/1.2.pbr.vs
View File

@@ -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);

1
src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.cubemap.vs
View File

@@ -9,6 +9,5 @@ uniform mat4 view;
void main()
{
WorldPos = aPos;
gl_Position = projection * view * vec4(WorldPos, 1.0);
}

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

@@ -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);

1
src/6.pbr/2.1.2.ibl_irradiance/2.1.2.cubemap.vs
View File

@@ -9,6 +9,5 @@ uniform mat4 view;
void main()
{
WorldPos = aPos;
gl_Position = projection * view * vec4(WorldPos, 1.0);
}

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

@@ -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);

1
src/6.pbr/2.2.1.ibl_specular/2.2.1.cubemap.vs
View File

@@ -9,6 +9,5 @@ uniform mat4 view;
void main()
{
WorldPos = aPos;
gl_Position = projection * view * vec4(WorldPos, 1.0);
}

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

@@ -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);

1
src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.cubemap.vs
View File

@@ -9,6 +9,5 @@ uniform mat4 view;
void main()
{
WorldPos = aPos;
gl_Position = projection * view * vec4(WorldPos, 1.0);
}

2
src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.vs
View File

@@ -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);