Split chapter 10 into two

Chapter 10 does not include PBR which has been pushed to chapter 11

Author: lwjglgamedev

bookcontents/README.md

@@ -12,4 +12,5 @@ The book is structured in the following chapters:
 - [Chapter 07](chapter-07/chapter-07.md): In this chapter we go 3D by implementing depth testing and add windows resizing support.
 - [Chapter 08](chapter-08/chapter-08.md): In this chapter we add support for loading complex 3D models using Assimp and textures.
 - [Chapter 09](chapter-09/chapter-09.md): We will automatically generate mipmaps, add support for transparent objects, add a camera to move around the scene and use dynamic uniform objects.
-- [Chapter 10](chapter-09/chapter-10.md): Deferred rendering.
+- [Chapter 10](chapter-09/chapter-10.md): Deferred rendering (I).
+- [Chapter 10](chapter-09/chapter-11.md): Deferred rendering (II).

bookcontents/chapter-10/chapter-10.md

@@ -0,0 +1,3 @@
+# Deferred rendering (II)
+
+Pending

bookcontents/chapter-10/triangle-pos.svg

@@ -1,63 +1,15 @@
 #version 450
 
-layout(location = 0) in vec3 inNormal;
-layout(location = 1) in vec3 inTangent;
-layout(location = 2) in vec3 inBitangent;
-layout(location = 3) in vec2 inTextCoords;
-
+layout(location = 0) in vec2 textCoords;
 layout(location = 0) out vec4 outAlbedo;
-layout(location = 1) out vec4 outNormal;
-layout(location = 2) out vec4 outPBR;
 
 layout(set = 2, binding = 0) uniform sampler2D textSampler;
-layout(set = 3, binding = 0) uniform sampler2D normalSampler;
-layout(set = 4, binding = 0) uniform sampler2D metRoughSampler;
 
-layout(set = 5, binding = 0) uniform MaterialUniform {
+layout(set = 3, binding = 0) uniform MaterialUniform {
     vec4 diffuseColor;
-    float hasNormalMap;
-    float hasMetalRoughMap;
-    float roughnessFactor;
-    float metallicFactor;
 } material;
 
-vec3 calcNormal(float hasNormalMap, vec3 normal, vec2 textCoords, mat3 TBN)
-{
-    vec3 newNormal = normal;
-    if (hasNormalMap > 0)
-    {
-        newNormal = texture(normalSampler, textCoords).rgb;
-        newNormal = normalize(newNormal * 2.0 - 1.0);
-        newNormal = normalize(TBN * newNormal);
-    }
-    return newNormal;
-}
-
 void main()
 {
-    outAlbedo = material.diffuseColor + texture(textSampler, inTextCoords);
-
-    // Hack to avoid transparent PBR artifacts
-    if (outAlbedo.a < 0.5) {
-        discard;
-    }
-
-    mat3 TBN = mat3(inTangent, inBitangent, inNormal);
-    vec3 newNormal = calcNormal(material.hasNormalMap, inNormal, inTextCoords, TBN);
-    // Transform normals from [-1, 1] to [0, 1]
-    outNormal = vec4(0.5 * newNormal + 0.5, 1.0);
-
-    float ao = 0.5f;
-    float roughnessFactor = 0.0f;
-    float metallicFactor = 0.0f;
-    if (material.hasMetalRoughMap > 0) {
-        vec4 metRoughValue = texture(metRoughSampler, inTextCoords);
-        roughnessFactor = metRoughValue.g;
-        metallicFactor = metRoughValue.b;
-    } else {
-        roughnessFactor = material.roughnessFactor;
-        metallicFactor = material.metallicFactor;
-    }
-
-    outPBR = vec4(ao, roughnessFactor, metallicFactor, 1.0f);
+    outAlbedo = material.diffuseColor + texture(textSampler, textCoords);
 }

bookcontents/chapter-11/chapter-11.md

@@ -1,15 +1,9 @@
 #version 450
 
 layout(location = 0) in vec3 entityPos;
-layout(location = 1) in vec3 entityNormal;
-layout(location = 2) in vec3 entityTangent;
-layout(location = 3) in vec3 entityBitangent;
-layout(location = 4) in vec2 entityTextCoords;
+layout(location = 1) in vec2 entityTextCoords;
 
-layout(location = 0) out vec3 outNormal;
-layout(location = 1) out vec3 outTangent;
-layout(location = 2) out vec3 outBitangent;
-layout(location = 3) out vec2 outTextCoords;
+layout(location = 0) out vec2 textCoords;
 
 layout(set = 0, binding = 0) uniform ProjUniform {
     mat4 projectionMatrix;
@@ -24,10 +18,6 @@ layout(push_constant) uniform matrices {
 
 void main()
 {
-    mat4 modelViewMatrix = viewUniform.viewMatrix * push_constants.modelMatrix;
-    outNormal     = normalize(modelViewMatrix * vec4(entityNormal, 0)).xyz;
-    outTangent    = normalize(modelViewMatrix * vec4(entityTangent, 0)).xyz;
-    outBitangent  = normalize(modelViewMatrix * vec4(entityBitangent, 0)).xyz;
-    outTextCoords = entityTextCoords;
-    gl_Position   =  projUniform.projectionMatrix * modelViewMatrix * vec4(entityPos, 1);
+    gl_Position = projUniform.projectionMatrix * viewUniform.viewMatrix * push_constants.modelMatrix * vec4(entityPos, 1);
+    textCoords = entityTextCoords;
 }