From da17b70fda6e16a469fc576e5c085687a6b12ed8 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Sun, 10 Dec 2017 12:22:13 +0100
Subject: [PATCH] Small fixes, optimizations and different default scene

---
 data/shaders/shadowmappingcascade/scene.frag  |  12 ++---
 .../shadowmappingcascade/scene.frag.spv       | Bin 8136 -> 8188 bytes
 .../shadowmappingcascade.cpp                  |  48 +++++++++---------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/data/shaders/shadowmappingcascade/scene.frag b/data/shaders/shadowmappingcascade/scene.frag
index d6d7fc30..9ba3e9c5 100644
--- a/data/shaders/shadowmappingcascade/scene.frag
+++ b/data/shaders/shadowmappingcascade/scene.frag
@@ -50,7 +50,7 @@ float textureProj(vec4 P, vec2 offset, uint cascadeIndex)
 float filterPCF(vec4 sc, uint cascadeIndex)
 {
 	ivec2 texDim = textureSize(shadowMap, 0).xy;
-	float scale = 1.5;
+	float scale = 0.75;
 	float dx = scale * 1.0 / float(texDim.x);
 	float dy = scale * 1.0 / float(texDim.y);
 
@@ -93,23 +93,23 @@ void main()
 	vec3 H = normalize(L + inViewPos);
 	float diffuse = max(dot(N, L), 0.0);
 	vec3 lightColor = vec3(1.0);
-	outFragColor.rgb = max(lightColor * (diffuse ), vec3(0.0));
+	outFragColor.rgb = max(lightColor * (diffuse * inColor), vec3(0.0));
 	outFragColor.rgb *= shadow;
 
 	// Color cascades (if enabled)
 	if (ubo.colorCascades == 1) {
 		switch(cascadeIndex) {
 			case 0 : 
-				outFragColor.rgb *= vec3(1.0f, 0.0f, 0.0f);
+				outFragColor.rgb *= vec3(1.0f, 0.25f, 0.25f);
 				break;
 			case 1 : 
-				outFragColor.rgb *= vec3(0.0f, 1.0f, 0.0f);
+				outFragColor.rgb *= vec3(0.25f, 1.0f, 0.25f);
 				break;
 			case 2 : 
-				outFragColor.rgb *= vec3(0.0f, 0.0f, 1.0f);
+				outFragColor.rgb *= vec3(0.25f, 0.25f, 1.0f);
 				break;
 			case 3 : 
-				outFragColor.rgb *= vec3(1.0f, 1.0f, 0.0f);
+				outFragColor.rgb *= vec3(1.0f, 1.0f, 0.25f);
 				break;
 		}
 	}
diff --git a/data/shaders/shadowmappingcascade/scene.frag.spv b/data/shaders/shadowmappingcascade/scene.frag.spv
index 63d9f2b2a3c1f36839fa9638cec5260026dee034..20bef5b8855150f6a53039c6635936c1d246b15a 100644
GIT binary patch
delta 1111
zcmYk5OHWf#6ovO~ON+%OU~jEF6e=hnpokAZ(g#FD6B8p7ocRkJIC8+CPMn&U`wN_C
zA|q2LPMGS<U*L~$<a6M+4tFQ#w!3Gowa?yb-*a!jcK>y2#lmdGEa5Y358u?DCiRcc
zz7>=Dpj|plSUwNc3Q2G9rSiBizGWr*WM=h56=us;whn7EYgL>57Sa%GhFurI1@IGM
z30`KssuFwI@v3X^iCkCC_1j=^&$-^tb<eqe_hfG+FBlwG-<A7qOf_0cQscg6H1P&l
z+8N?iuAK#s5z3vmO4xS}%-0qO<(q_ha#l7D9wi>xslX?|(o|C-&mm+-=~!R7YIO6H
z;P0&7V+wxKV>tMohf7oF(xL<Oxi27SkNS9zX>dHp3|yM_GDr44ZS<vWGm#$1EOAUv
zJt+0i!<ozV5A2zPUxG_}0sd)4n+NOq!+zy16ViS$ov`|hkY4~Fv8rYTtn06h?1zL4
zizJl0!jEoliM7bO%&LaU`^~L_;{&=5m$sVyNSiBbASrr>yy6BpK8~AkX=~Zrbn=$i
zZ#*=MyflMXu7hK*4Y;)R;I#>oqW97(?to*jEx5GJ;3XD&={~)(1CG7AaA}?3)dNY<
zyY3a+;Mi*iF0B{5#9}X<rC08PW3PK~X}iH|4<tqZAFsF%j=dhhrR~Y9B^G<>EXDnW
Lm>)cE98~`UuWVlh

delta 1033
zcmYk4%~BIV6ov03A%S2@(HWxP4@gANfG7q_AV5Hiu%d7yJDz~G3m16<tEhPfUC4?G
z8#b0ZUC9&p9R4o&&M>#Chr0AR=l-1TPXAy3zFsR9rYdF;e}lGjR6B^eCx_?7sM~Ls
z-bXBF1GPf*wg0WMR~Twq+1AV~PM=omy}Oaw0Bpiab`M+t?-O427;Ox`ormks(4~3K
z^_RKsIoCJxIbOel->F%}x+Eg&|EPW{?|on^+S(1Y5#l;=g&Ju|R%bSo=VN%AA)MPr
z!Pkgg8_IYcEG<bp@pw;6m1Qb#f`77l=PmeU=V0bC2A8JLr$txdI~zw(jpq1_+u+ds
z4qTdQOJ?bIob;r1IGwI|g80HrUA<=Lx+in}Gc^tPeYmuD;9pj>23X%;>Xn-!r2S@h
z!kRNo{sH)yRXvZu`u^GQn=IkNGzsM%@=u4GVJ))GvTC66ez+z$yr4O_v}Sq~*XQOz
zQuIo^;|Vytjs>{1dHonIu|IfdFY?kJymJv8dOe3rTg<##ASrrz-mwG@y<WhjwK6ZU
z&`am^&Sh}uwE~y6oO!K+r06w!M;jb^ttm&W%4<X{^qNgi;^gY(quM0bQDn2XKvFgc
epZy9P&VCJ-wx!vVV&QDvowz@MM*m~-wt4}tomp%E

diff --git a/examples/shadowmappingcascade/shadowmappingcascade.cpp b/examples/shadowmappingcascade/shadowmappingcascade.cpp
index d777d2f5..da236042 100644
--- a/examples/shadowmappingcascade/shadowmappingcascade.cpp
+++ b/examples/shadowmappingcascade/shadowmappingcascade.cpp
@@ -30,7 +30,6 @@
 #else
 #define SHADOWMAP_DIM 2048
 #endif
-#define SHADOWMAP_FILTER VK_FILTER_LINEAR
 
 #define SHADOW_MAP_CASCADE_COUNT 4
 
@@ -144,9 +143,11 @@ public:
 		camera.type = Camera::CameraType::firstperson;
 		camera.movementSpeed = 2.5f;
 		camera.setPerspective(45.0f, (float)width / (float)height, zNear, zFar);
-		camera.setPosition(glm::vec3(8.75f, 0.5f, -8.3f));
-		camera.setRotation(glm::vec3(-1.0f, 50.0f, 0.0f));
+		camera.setPosition(glm::vec3(2.0f, 0.375f, -1.25f));
+		camera.setRotation(glm::vec3(-19.0f, 42.0f, 0.0f));
 		settings.overlay = true;
+		timer = 0.317028880f;
+		paused = true;
 	}
 
 	~VulkanExample()
@@ -313,8 +314,8 @@ public:
 
 		// Shared sampler for cascade deoth reads
 		VkSamplerCreateInfo sampler = vks::initializers::samplerCreateInfo();
-		sampler.magFilter = SHADOWMAP_FILTER;
-		sampler.minFilter = SHADOWMAP_FILTER;
+		sampler.magFilter = VK_FILTER_LINEAR;
+		sampler.minFilter = VK_FILTER_LINEAR;
 		sampler.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
 		sampler.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
 		sampler.addressModeV = sampler.addressModeU;
@@ -387,7 +388,7 @@ public:
 		renderPassBeginInfo.clearValueCount = 2;
 		renderPassBeginInfo.pClearValues = clearValues;
 
-		for (int32_t i = 0; i < drawCmdBuffers.size(); ++i) {
+		for (int32_t i = 0; i < drawCmdBuffers.size(); i++) {
 			renderPassBeginInfo.framebuffer = frameBuffers[i];
 
 			VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo));
@@ -426,9 +427,10 @@ public:
 	void loadAssets()
 	{
 		scenes.resize(2);
-		scenes[0].loadFromFile(getAssetPath() + "models/terrain.obj", vertexLayout, 2.0f, vulkanDevice, queue);
-		scenes[1].loadFromFile(getAssetPath() + "models/shadowtest.obj", vertexLayout, 0.25f, vulkanDevice, queue);
-		sceneNames = {"Terrain test", "Object test" };
+		scenes[0].loadFromFile(getAssetPath() + "models/trees.dae", vertexLayout, 1.0f, vulkanDevice, queue);
+		scenes[1].loadFromFile(getAssetPath() + "models/samplescene.dae", vertexLayout, 0.25f, vulkanDevice, queue);
+		sceneNames = { "Trees", "Teapots and pillars" };
+
 	}
 
 	void setupDescriptorPool()
@@ -655,6 +657,7 @@ public:
 	}
 
 	// Calculate frustum split depths and matrices for the shadow map cascades
+	// Based on https://johanmedestrom.wordpress.com/2016/03/18/opengl-cascaded-shadow-maps/
 	void updateCascades()
 	{
 		float cascadeSplits[SHADOW_MAP_CASCADE_COUNT];
@@ -681,7 +684,7 @@ public:
 
 		// Calculate orthographic projection matrix for each cascade
 		float lastSplitDist = 0.0;
-		for (uint32_t i = 0; i < SHADOW_MAP_CASCADE_COUNT; ++i) {
+		for (uint32_t i = 0; i < SHADOW_MAP_CASCADE_COUNT; i++) {
 			float splitDist = cascadeSplits[i];
 
 			glm::vec3 frustumCorners[8] = {
@@ -697,12 +700,12 @@ public:
 
 			// Project frustum corners into world space
 			glm::mat4 invCam = glm::inverse(camera.matrices.perspective * camera.matrices.view);
-			for (uint32_t i = 0; i < 8; ++i) {
+			for (uint32_t i = 0; i < 8; i++) {
 				glm::vec4 invCorner = invCam * glm::vec4(frustumCorners[i], 1.0f);
 				frustumCorners[i] = invCorner / invCorner.w;
 			}
 
-			for (uint32_t i = 0; i < 4; ++i) {
+			for (uint32_t i = 0; i < 4; i++) {
 				glm::vec3 dist = frustumCorners[i + 4] - frustumCorners[i];
 				frustumCorners[i + 4] = frustumCorners[i] + (dist * splitDist);
 				frustumCorners[i] = frustumCorners[i] + (dist * lastSplitDist);
@@ -716,25 +719,21 @@ public:
 			frustumCenter /= 8.0f;
 
 			float radius = 0.0f;
-			for (uint32_t i = 0; i < 8; ++i) {
+			for (uint32_t i = 0; i < 8; i++) {
 				float distance = glm::length(frustumCorners[i] - frustumCenter);
 				radius = glm::max(radius, distance);
 			}
 			radius = std::ceil(radius * 16.0f) / 16.0f;
 
-			glm::vec3 maxExtents = glm::vec3(radius, radius, radius);
+			glm::vec3 maxExtents = glm::vec3(radius);
 			glm::vec3 minExtents = -maxExtents;
 
 			glm::vec3 lightDir = normalize(-lightPos);
 			glm::mat4 lightViewMatrix = glm::lookAt(frustumCenter - lightDir * -minExtents.z, frustumCenter, glm::vec3(0.0f, 1.0f, 0.0f));
-
-			glm::vec3 cascadeExtents = maxExtents - minExtents;
-
-			glm::mat4 lightOrthoMatrix = glm::ortho(minExtents.x, maxExtents.x, minExtents.y, maxExtents.y, 0.0f, cascadeExtents.z);
+			glm::mat4 lightOrthoMatrix = glm::ortho(minExtents.x, maxExtents.x, minExtents.y, maxExtents.y, 0.0f, maxExtents.z - minExtents.z);
 
 			// Store split distance and matrix in cascade
-			const float clipDist = camera.getFarClip() - camera.getNearClip();
-			cascades[i].splitDepth = (camera.getNearClip() + splitDist * clipDist) * -1.0f;
+			cascades[i].splitDepth = (camera.getNearClip() + splitDist * clipRange) * -1.0f;
 			cascades[i].viewProjMatrix = lightOrthoMatrix * lightViewMatrix;
 
 			lastSplitDist = cascadeSplits[i];
@@ -743,9 +742,9 @@ public:
 
 	void updateLight()
 	{
-		lightPos.x = cos(glm::radians(timer * 360.0f)) * 50.0f;
-		lightPos.y = -20.0f;
-		lightPos.z = sin(glm::radians(timer * 360.0f)) * 50.0f;
+		float angle = glm::radians(timer * 360.0f);
+		float radius = 20.0f;
+		lightPos = glm::vec3(cos(angle) * radius, -radius, sin(angle) * radius);
 	}
 
 	void updateUniformBuffers()
@@ -813,6 +812,8 @@ public:
 	{
 		VulkanExampleBase::prepare();
 		loadAssets();
+		updateLight();
+		updateCascades();
 		prepareShadowMaps();
 		prepareUniformBuffers();
 		setupDescriptorPool();
@@ -820,7 +821,6 @@ public:
 		preparePipelines();
 		buildCommandBuffers();
 		buildOffscreenCommandBuffer();
-		updateCascades();
 		prepared = true;
 	}