Chapter 15 and 16

Author: lwjglgamedev

bookcontents/.gitignore

@@ -0,0 +1,13 @@
+{
+    "cSpell.words": [
+        "assimp",
+        "bitangents",
+        "calloc",
+        "GLSL",
+        "LWJGL",
+        "malloc",
+        "SPIR",
+        "tinylog",
+        "vulkanb"
+    ]
+}

bookcontents/.vscode/settings.json

@@ -414,7 +414,7 @@ public class LightRender {
                                          TextureSampler sampler) {
         DescAllocator descAllocator = vkCtx.getDescAllocator();
         Device device = vkCtx.getDevice();
-        DescSet descSet = descAllocator.addDescSets(device, DESC_ID_ATT, 1, descSetLayout)[0];
+        DescSet descSet = descAllocator.addDescSet(device, DESC_ID_ATT, descSetLayout);
         List<ImageView> imageViews = new ArrayList<>();
         attachments.forEach(a -> imageViews.add(a.getImageView()));
         descSet.setImages(device, imageViews, sampler, 0);

bookcontents/chapter-14/chapter-14.md

@@ -59,7 +59,7 @@ private static void createAttDescSet(VkCtx vkCtx, DescSetLayout descSetLayout, L
                                          TextureSampler sampler) {
         DescAllocator descAllocator = vkCtx.getDescAllocator();
         Device device = vkCtx.getDevice();
-        DescSet descSet = descAllocator.addDescSets(device, DESC_ID_ATT, 1, descSetLayout)[0];
+        DescSet descSet = descAllocator.addDescSet(device, DESC_ID_ATT, descSetLayout);
         List<ImageView> imageViews = new ArrayList<>();
         attachments.forEach(a -> imageViews.add(a.getImageView()));
         descSet.setImages(device, imageViews, sampler, 0);

bookcontents/chapter-15/chapter-15.md

@@ -21,13 +21,13 @@ layout(set = 0, binding = 1) uniform sampler2D albedoSampler;
 layout(set = 0, binding = 2) uniform sampler2D normalsSampler;
 layout(set = 0, binding = 3) uniform sampler2D pbrSampler;
 
-layout(scalar, set = 1, binding = 0) uniform Lights {
-    vec3 ambientLightColor;
-    uint numLights;
-    Light lights[MAX_LIGHTS];
+layout(scalar, set = 1, binding = 0) readonly buffer Lights {
+    Light lights[];
 } lights;
-layout(set = 2, binding = 0) uniform SceneInfo {
+layout(scalar, set = 2, binding = 0) uniform SceneInfo {
     vec3 camPos;
+    vec3 ambientLightColor;
+    uint numLights;
 } sceneInfo;
 
 float distributionGGX(float dotNH, float roughness)
@@ -95,7 +95,7 @@ void main() {
     F0 = mix(F0, albedo, metallic);
 
     vec3 Lo = vec3(0.0);
-    for (uint i = 0U; i < lights.numLights; i++) {
+    for (uint i = 0U; i < sceneInfo.numLights; i++) {
         Light light = lights.lights[i];
         // calculate per-light radiance
         vec3 L;
@@ -113,7 +113,7 @@ void main() {
         Lo += BRDF(albedo, light.color.rgb * attenuation, L, V, N, metallic, roughness);
     }
 
-    vec3 ambient = lights.ambientLightColor.rgb * albedo;
+    vec3 ambient = sceneInfo.ambientLightColor.rgb * albedo;
     vec3 color = ambient + Lo;
 
     outFragColor = vec4(color, 1.0);

bookcontents/chapter-15/rc15-artifacts.png

@@ -25,10 +25,10 @@ struct Material {
     float roughnessFactor;
     float metallicFactor;
 };
-layout(set = 2, binding = 0) uniform sampler2D textSampler[MAX_TEXTURES];
-layout(set = 3, binding = 0) readonly buffer MaterialUniform {
+layout(set = 2, binding = 0) readonly buffer MaterialUniform {
     Material materials[];
 } matUniform;
+layout(set = 3, binding = 0) uniform sampler2D textSampler[MAX_TEXTURES];
 
 vec3 calcNormal(Material material, vec3 normal, vec2 textCoords, mat3 TBN)
 {

bookcontents/chapter-15/rc15-attachments.png

@@ -56,16 +56,12 @@ public InitData init(EngCtx engCtx) {
 
         scene.getAmbientLight().set(0.2f, 0.2f, 0.2f);
         List<Light> lights = new ArrayList<>();
-        dirLight = new Light();
-        dirLight.getPosition().set(0.0f, -1.0f, 0.0f, 0.0f);
-        dirLight.getColor().set(1.0f, 1.0f, 1.0f, 1.0f);
+        dirLight = new Light(new Vector4f(0.0f, -1.0f, 0.0f, 0.0f), new Vector4f(1.0f, 1.0f, 1.0f, 1.0f));
         lights.add(dirLight);
 
-        pointLight = new Light();
-        pointLight.getPosition().set(5.0f, 3.4f, 0.9f, 1.0f);
-        pointLight.getColor().set(0.0f, 1.0f, 0.0f, 1.0f);
+        pointLight = new Light(new Vector4f(5.0f, 3.4f, 0.9f, 1.0f), new Vector4f(0.0f, 1.0f, 0.0f, 1.0f));
         lights.add(pointLight);
-        Vector4f pointPos = pointLight.getPosition();
+        Vector4f pointPos = pointLight.position();
         lightEntity.setPosition(pointPos.x, pointPos.y, pointPos.z);
         lightEntity.updateModelMatrix();
 
@@ -114,14 +110,14 @@ public void input(EngCtx engCtx, long diffTimeMillis) {
 
         move = move * 0.1f;
         if (ki.keyPressed(GLFW_KEY_1)) {
-            pointLight.getPosition().y += move;
+            pointLight.position().y += move;
         } else if (ki.keyPressed(GLFW_KEY_2)) {
-            pointLight.getPosition().y -= move;
+            pointLight.position().y -= move;
         }
         if (ki.keyPressed(GLFW_KEY_3)) {
-            pointLight.getPosition().z -= move;
+            pointLight.position().z -= move;
         } else if (ki.keyPressed(GLFW_KEY_4)) {
-            pointLight.getPosition().z += move;
+            pointLight.position().z += move;
         }
 
         MouseInput mi = window.getMouseInput();
@@ -144,15 +140,15 @@ public void input(EngCtx engCtx, long diffTimeMillis) {
 
     @Override
     public void update(EngCtx engCtx, long diffTimeMillis) {
-        Vector4f pointPos = pointLight.getPosition();
+        Vector4f pointPos = pointLight.position();
         lightEntity.setPosition(pointPos.x, pointPos.y, pointPos.z);
         lightEntity.updateModelMatrix();
     }
 
     private void updateDirLight() {
         float zValue = (float) Math.cos(Math.toRadians(lightAngle));
         float yValue = (float) Math.sin(Math.toRadians(lightAngle));
-        Vector4f lightDirection = dirLight.getPosition();
+        Vector4f lightDirection = dirLight.position();
         lightDirection.x = 0;
         lightDirection.y = yValue;
         lightDirection.z = zValue;