From 826df94c96d9576a0a27930c699058097b961916 Mon Sep 17 00:00:00 2001
From: Brandon Mak <xenosas@hotmail.com>
Date: Mon, 6 Mar 2023 00:02:06 +0800
Subject: [PATCH] Shadows WIP

---
 Assets/Shaders/Anim_VS.glsl                   |   9 +-
 Assets/Shaders/Anim_VS.shshaderb              | Bin 6053 -> 6505 bytes
 Assets/Shaders/DeferredComposite_CS.glsl      |  32 +++--
 Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 10085 -> 11109 bytes
 Assets/Shaders/ShadowMapBlur_CS.glsl          |  58 +++++++++
 Assets/Shaders/ShadowMapBlur_CS.shshaderb     | Bin 0 -> 4569 bytes
 .../Shaders/ShadowMapBlur_CS.shshaderb.shmeta |   3 +
 Assets/Shaders/ShinyHighlight_FS.glsl         |   3 +-
 Assets/Shaders/ShinyHighlight_FS.shshaderb    | Bin 5273 -> 5397 bytes
 Assets/Shaders/TestCube_FS.glsl               |   7 +-
 Assets/Shaders/TestCube_FS.shshaderb          | Bin 2557 -> 2913 bytes
 Assets/Shaders/TestCube_VS.glsl               |   9 +-
 Assets/Shaders/TestCube_VS.shshaderb          | Bin 4133 -> 4585 bytes
 .../MiddleEnd/Interface/SHGraphicsSystem.cpp  | 112 ++++++++++--------
 .../MiddleEnd/Interface/SHGraphicsSystem.h    |   1 +
 .../MiddleEnd/Lights/SHLightingSubSystem.cpp  |  19 +--
 .../MiddleEnd/Lights/SHLightingSubSystem.h    |   5 +-
 .../RenderGraph/SHRenderGraphNode.cpp         |   1 +
 18 files changed, 183 insertions(+), 76 deletions(-)
 create mode 100644 Assets/Shaders/ShadowMapBlur_CS.glsl
 create mode 100644 Assets/Shaders/ShadowMapBlur_CS.shshaderb
 create mode 100644 Assets/Shaders/ShadowMapBlur_CS.shshaderb.shmeta

diff --git a/Assets/Shaders/Anim_VS.glsl b/Assets/Shaders/Anim_VS.glsl
index 2213b2fd..5282f062 100644
--- a/Assets/Shaders/Anim_VS.glsl
+++ b/Assets/Shaders/Anim_VS.glsl
@@ -20,10 +20,11 @@ layout(location = 0) out struct
   vec2 uv; // location = 1
   vec4 normal; // location = 2
   vec4 worldPos; // location = 3 
+  vec3 worldNormal; // location = 4 
 } Out;
 
 // material stuff
-layout(location = 4) out struct
+layout(location = 5) out struct
 {
   int materialIndex;
   uint eid;
@@ -61,11 +62,13 @@ void main()
   // uvs for texturing in fragment shader
   Out.uv = aUV;
 
-  mat3 transposeInv = mat3 (transpose(inverse(modelViewMat)));
+  mat3 mvTransInv = mat3 (transpose(inverse(modelViewMat)));
+  mat3 modelTransInv = mat3 (transpose(inverse(worldTransform)));
 
   // normals are also in view space
-  Out.normal.rgb = transposeInv * aNormal.rgb;
+  Out.normal.rgb = mvTransInv * aNormal.rgb;
   Out.normal.rgb = normalize (Out.normal.rgb);
+  Out.worldNormal = normalize (modelTransInv * aNormal);
 
   // Compute bone matrix
   mat4 boneMatrix = BoneMatrices.data[firstBoneIndex + aBoneIndices[0]] * aBoneWeights[0];
diff --git a/Assets/Shaders/Anim_VS.shshaderb b/Assets/Shaders/Anim_VS.shshaderb
index 6318555888e0c1f04b668c241c14b5ab73baa8b8..41ddaec30d51d8329f421590fc375cb48161e8fd 100644
GIT binary patch
literal 6505
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

literal 6053
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

diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl
index 2cf33ae1..18f53de4 100644
--- a/Assets/Shaders/DeferredComposite_CS.glsl
+++ b/Assets/Shaders/DeferredComposite_CS.glsl
@@ -2,6 +2,7 @@
 
 struct DirectionalLightStruct
 {
+  vec4 directionWorld;
   vec3 direction;
   uint isActive;
   uint cullingMask;
@@ -22,7 +23,7 @@ layout(local_size_x = 16, local_size_y = 16) in;
 layout(set = 3, binding = 0, rgba32f) uniform image2D positions;
 layout(set = 3, binding = 1, rgba32f) uniform image2D normals;
 layout(set = 3, binding = 2, rgba8) uniform image2D albedo;
-layout(set = 3, binding = 3, r32ui) uniform uimage2D lightLayerData;
+layout(set = 3, binding = 3, rgba32ui) uniform uimage2D lightLayerData;
 layout(set = 3, binding = 4, r8) uniform image2D ssaoBlurredImage;
 layout(set = 3, binding = 5, rgba8) uniform image2D positionWorldSpace;
 layout(set = 3, binding = 6, rgba8) uniform image2D targetImage;
@@ -54,7 +55,7 @@ float LinStep (float val, float low, float high)
   return clamp ((val - low)/(high - low), 0.0f, 1.0f);
 }
 
-float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV)
+float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV, vec3 worldNormal, vec3 lightDir)
 {
   // clip space for fragment from light view space
   vec4 fragPosLightPOV = lightPV * worldSpaceFragPos;
@@ -69,6 +70,13 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
   if (converted.x < 0.0f || converted.x > 1.0f || converted.y < 0.0f || converted.y > 1.0f)
     return 1.0f;
 
+  float returnVal = 0.0f;
+
+  float worldNormalDotLight = dot (normalize (worldNormal), normalize(lightDir));
+  
+  if (worldNormalDotLight < 0.0f)
+    return 0.7f;
+
   if (fragPosLightPOV.z > moments.x && fragPosLightPOV.w > 0.0f)
   {
     float p = step (fragPosLightPOV.z, moments.x);
@@ -76,15 +84,19 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV
 
     float d = fragPosLightPOV.z - moments.x;
     float pMax = LinStep (variance / (variance + (d * d)), 0.9f, 1.0f);
-    return min (max (p, pMax), 1.0f);
+   
+    returnVal = min (max (p, pMax) + 0.7f, 1.0f);
+
+    return returnVal;
+    
   }
   else if (fragPosLightPOV.z > 1.0f)
   {
     return 0.0f;
   }
-  else
-    return 1.0f;
-  // return step (fragPosLightPOV.z, );
+
+  return 1.0f;
+
 }
 
 void main()
@@ -104,8 +116,12 @@ void main()
   // normal of fragment
   vec3 normalView = imageLoad(normals, globalThread).rgb;
 
+  uvec4 lightLayerAndNormal = imageLoad (lightLayerData, globalThread);
+
   // light layer index
-  uint lightLayer = imageLoad (lightLayerData, globalThread).r;
+  uint lightLayer =  lightLayerAndNormal.x;
+  
+  vec3 worldNormal = vec3 (unpackHalf2x16 (lightLayerAndNormal.y).xy, unpackHalf2x16 (lightLayerAndNormal.z).x);
 
   vec3 fragColor = vec3 (0.0f);
 
@@ -138,7 +154,7 @@ void main()
       if ((DirLightData.dLightData[i].shadowData & uint(1)) == 1)
       {
         // calculate shadow map here
-        fragColor *= CalcShadowValue (shadowMaps[0], positionWorld, DirLightData.dLightData[i].pvMatrix).xxx;
+        fragColor.rgb *= CalcShadowValue (shadowMaps[0], positionWorld, DirLightData.dLightData[i].pvMatrix, worldNormal, DirLightData.dLightData[i].directionWorld.xyz).xxx;
       }
     }
   }
diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index e0b019b110f203343587a12900cb4cdfacd2b8c4..57401b13063ae5536870be4281bf45663baf213c 100644
GIT binary patch
literal 11109
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
PzIq4stK-?~cj0dVKJ1B)

literal 10085
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
BAszq#

diff --git a/Assets/Shaders/ShadowMapBlur_CS.glsl b/Assets/Shaders/ShadowMapBlur_CS.glsl
new file mode 100644
index 00000000..eabb655f
--- /dev/null
+++ b/Assets/Shaders/ShadowMapBlur_CS.glsl
@@ -0,0 +1,58 @@
+#version 450
+
+#define BLUR_WIDTH 7
+#define BLUR_HALF_WIDTH BLUR_WIDTH / 2
+#define SHM_WIDTH BLUR_WIDTH + 16 - 1
+
+layout(local_size_x = 16, local_size_y = 16) in;
+layout(set = 3, binding = 0, r8) uniform image2D shadowMap;
+layout(set = 3, binding = 1, r8) uniform image2D shadowMapBlurred;
+
+
+vec4 GetShadowMapValue(ivec2 uv, ivec2 imageSize)
+{
+  if (uv.x >= 0 && uv.y >= 0 && uv.x < imageSize.x && uv.y < imageSize.y)
+  {
+    return imageLoad (shadowMap, uv);
+  }
+
+  return vec4 (0.0f);
+}
+
+shared vec4 sharedPixels[16 + BLUR_WIDTH - 1][16 + BLUR_WIDTH - 1];
+
+void main()
+{ 
+  ivec2 globalThread = ivec2 (gl_GlobalInvocationID.xy);
+  ivec2 localThread = ivec2 (gl_LocalInvocationID.xy);
+  ivec2 inputImageSize = imageSize(shadowMap);
+
+  // Load color into shared memory
+  ivec2 start = ivec2 (gl_WorkGroupID) * ivec2 (gl_WorkGroupSize) - (BLUR_HALF_WIDTH);
+  for (int i = localThread.x; i < SHM_WIDTH; i += int (gl_WorkGroupSize.x))
+  {
+    for (int j = localThread.y; j < SHM_WIDTH; j += int (gl_WorkGroupSize.y))
+    {
+      vec4 value = GetShadowMapValue (start + ivec2 (i, j), inputImageSize);
+      sharedPixels[i][j] = value;
+    }
+  }
+  
+  // wait for all shared memory to load
+  barrier();
+
+  ivec2 shmStart = ivec2 (localThread + (BLUR_HALF_WIDTH));
+
+  vec4 sum = vec4 (0.0f);
+  for (int i = -BLUR_HALF_WIDTH; i <= BLUR_HALF_WIDTH; ++i)
+  {
+    for (int j = -BLUR_HALF_WIDTH; j <= BLUR_HALF_WIDTH; ++j)
+    {
+      vec4 sharedVal = sharedPixels[shmStart.x + i][shmStart.y + j];
+      sum += sharedVal;
+    }
+  }
+
+  sum /= (BLUR_WIDTH * BLUR_WIDTH);
+  imageStore(shadowMapBlurred, globalThread, sum);
+}
\ No newline at end of file
diff --git a/Assets/Shaders/ShadowMapBlur_CS.shshaderb b/Assets/Shaders/ShadowMapBlur_CS.shshaderb
new file mode 100644
index 0000000000000000000000000000000000000000..d02afaf1c4385f91bf082bc5cae9570086ea2cd9
GIT binary patch
literal 4569
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
Q|5&SS4s&U*M|*$&4|n0d!2kdN

literal 0
HcmV?d00001

diff --git a/Assets/Shaders/ShadowMapBlur_CS.shshaderb.shmeta b/Assets/Shaders/ShadowMapBlur_CS.shshaderb.shmeta
new file mode 100644
index 00000000..cc90d5c9
--- /dev/null
+++ b/Assets/Shaders/ShadowMapBlur_CS.shshaderb.shmeta
@@ -0,0 +1,3 @@
+Name: ShadowMapBlur_CS
+ID: 38004013
+Type: 2
diff --git a/Assets/Shaders/ShinyHighlight_FS.glsl b/Assets/Shaders/ShinyHighlight_FS.glsl
index bb41a0fb..be26f866 100644
--- a/Assets/Shaders/ShinyHighlight_FS.glsl
+++ b/Assets/Shaders/ShinyHighlight_FS.glsl
@@ -57,7 +57,7 @@ layout (std430, set = 2, binding = 0) buffer MaterialProperties     // For mater
 
 layout(location = 0) out vec4 position;
 layout(location = 1) out uint outEntityID;
-layout(location = 2) out uint lightLayerIndices;
+layout(location = 2) out uvec4 lightLayerIndices;
 layout(location = 3) out vec4 normals;
 layout(location = 4) out vec4 albedo;
 layout(location = 5) out vec4 worldSpacePosition;
@@ -76,7 +76,6 @@ void main()
   worldSpacePosition = In.worldPos;
 
   outEntityID = In2.eid;
-  lightLayerIndices = In2.lightLayerIndex;
 
   // float vpHeight = float (In2.screenSpacePos.y) - MatProp.data[In2.materialIndex].highlightPosition;
   // bring the frame of reference to the object's screen space pos 
diff --git a/Assets/Shaders/ShinyHighlight_FS.shshaderb b/Assets/Shaders/ShinyHighlight_FS.shshaderb
index 408bba83d06bbbc37f21629ca6e54476d96e147a..572f3b31d0ed23942fb76dda3dfd28153ef4d70c 100644
GIT binary patch
delta 922
zcmZ8gOKTHR82#pzu}w8@+M<>55lpEH1vjM?D+M7fRPeEAb<uR1xwcc|q$ES7s~|42
za3vQP;?j)>jZL$2;SW&UxNzyO@CSI#^o|5CoPOUq-($|5N#D)9y*6=nY+SPA*kxbD
zl2JJ=$8RRyk8~k_1p56i_ne|D>&V;nu%UF|PL*n4E!7CqcwgObw)G$P$BZYQ973<E
zM784j-7pQMAa15XmM9hQf*k4%cXFPcHn1P77kkZCx)w+24tPQQY{D6;EvtBY2h$#E
zJ>7Gs#(SvpM0^MiD@Xdbdv4N~K6rxztKoratt3%gSM9-9?~$eZ{)Nu6vB|MA|KQ}B
zg`Ao@q|qd`Q$rffQ5!Q_ZigCARUDzl*($ajAzlG+f`7v06CvaD902y<oB!PoE@5U3
z6rV&Yz;$rO$G|U3e;BQdY$4_Pg02+14+6edGJ^#~A}~f+<I>NFoT9l~hSMB1@`s4@
z;^<Gs@>N>kcc%?j8K3;eYlEM~i?+9j2d(S#XJ$Lh*t7vG;a%TB+yoYZY2Y>%@h<#s
zo4^v*@-lT`9$*h^D*$_Wr3hfXW4JO}Vs<?Rr-uGcwtO3e&R@d-AI4u6o2WO<lGy0E
zp<Qs!bj{2&<kW5e`Ah>j^;hVjvF8ByQ0K*KGIt{8&Jz^)&yw>da=x9HX2BkEYKgvC
MnzObByQNw0FQhwmj{pDw

delta 837
zcmYk4OG`pQ7=}lW=bSEf11TtwN+^n`RYW(#2&^EAD7ruw(@~F=9n5MIxM&gWilIgH
z2ig>byM95N+O}>{`~E@iYjem?UT5a{zWFYrxBYj0t<BdVQ8B|Gv4!x7I?*5=Z(8qb
z*MKjfhv%0C!?4AgdN<ovO<{^n&{KC-I+<*dcgeC?<1#M`PI4wuObAN^DvbUVqAYwE
z<AdZu!abI$73WZb+9Ipw&5k6!26XDkGxw-a^zxgCaKNjwPoJdIvH)hGGJUiZ%fcAH
zk2Uk(jTf&b0&nFnbIDiYaAC*~&Fc2C6%l^HJjQm(0#%H6$ZDz>8z&2D<~2n|i(@o0
z-i?bud!@r}dSC#Ra~BV4(2kUU>{ox|IPfwEdo_gmsO#C{fJ|XQVf~`qQ)60TU5fA7
zi4-}kyu<QL$ur-FjQ#_?A5&KSrTVPzR4u_!c{teY?~CDOR^VQTqR;>|i7PC%0sV0U
ze~tOZp%SB~KzATU_d<;B!MY2P$MEBDh&^Z&V$3cy2Qij|Bq91QkdNmSv<;C*F&zJX
zWL~_)9xNyFx>y>3@Lac=!JaIJbe#4O;tR0&BIJ#f$DY0`6y}IW5bu(^x;d9zJvEK^
K66NovA@dhK(P&8k

diff --git a/Assets/Shaders/TestCube_FS.glsl b/Assets/Shaders/TestCube_FS.glsl
index 90b1922c..678ffb0e 100644
--- a/Assets/Shaders/TestCube_FS.glsl
+++ b/Assets/Shaders/TestCube_FS.glsl
@@ -17,10 +17,11 @@ layout(location = 0) in struct
   vec2 uv; // location = 1
   vec4 normal; // location = 2
   vec4 worldPos; // location = 3 
+  vec3 worldNormal; // location = 4 
 } In;
 
 // material stuff
-layout(location = 4) flat in struct
+layout(location = 5) flat in struct
 {
   int materialIndex;
   uint eid;
@@ -35,7 +36,7 @@ layout (std430, set = 2, binding = 0) buffer MaterialProperties     // For mater
 
 layout(location = 0) out vec4 position;
 layout(location = 1) out uint outEntityID;
-layout(location = 2) out uint lightLayerIndices;
+layout(location = 2) out uvec4 lightLayerIndices;
 layout(location = 3) out vec4 normals;
 layout(location = 4) out vec4 albedo;
 layout(location = 5) out vec4 worldSpacePosition;
@@ -48,5 +49,5 @@ void main()
   worldSpacePosition = In.worldPos;
 
   outEntityID = In2.eid;
-  lightLayerIndices = In2.lightLayerIndex;
+  lightLayerIndices = uvec4 (In2.lightLayerIndex, packHalf2x16 (In.worldNormal.xy), packHalf2x16 (vec2 (In.worldNormal.z, 1.0f)), 1);
 }
\ No newline at end of file
diff --git a/Assets/Shaders/TestCube_FS.shshaderb b/Assets/Shaders/TestCube_FS.shshaderb
index 2974523d7405e05bdcf30d419f0663694bcc271b..5374023a8a56c4d4726e2a1768556e058c308433 100644
GIT binary patch
literal 2913
zcmZ9MTXz#x6vt1=#aeDf1Vp5!t=0=#Yb}T(U}|d!1{w&``ZQ~rIkcnGnK+qL`sRz@
zNPY3mPvwhi`TtGMDZ#VW&c6N6-uvvmC$l>zO?fIO7GE)D%FLM4=7+J#oHHk6F(v=w
z^)dg`@xR1p%(Ursp9Y&dPlCt}`*}PlvOI{>$UcwLJ#*63%loZPud_TXqUE*gD}+8{
zDrE*@pH;r9ICK!kDUMe~XGBV2-ViN`z7jP>Ezzv*gIB?lDyq_$zZI;io2^dJe7qhE
z?I6s<!Un_rFtT}&?fz){#qec}Tq-k2!gOyG?%7~%b!8Cte^Q)j;_$3AOGjz^EXxmq
zpGRR5KZ|WH{|x@t)>f;t8T1E(U|1X_Hb~;s22q?VQ+#O2RmO3+IPE8+XcABpV)ETJ
zQ!C#-$cAwdXJs#HdfzF%k5iZ5%ZD~Ey4g^+YH6dFqr(>%dXlQ_Fu_(YF?9WxEKedX
z>UcXfl=g??3*@B#ZB;;x%wZgBSnA9qOm=OQ;jfvi(hK{%80EH%i)~J}2Vv38v%yAK
zgvvFx$!z*rlI7xcO%NQlyZdc+N9r-2cZA7cKb)}fj$NyuIyJ>;h%1-P<1itiS`$+V
zIq`8KiqPRb3*xRe=@s)14jt<8@_~!z3!=~XrbIT5j<M92#C!WiCp@zG7)?xeww<n)
z^|8BUe|uUltLD4u(x;|;*{Ik|i?}#yZ<Kg;{H2(2ziezvHSlfFGY&d)n$(#UIz7VA
ztk9V;I<w;a9Iwwy=3V!c-N#x4pyO@$vCU4{csn+7dK`JNHAKXJTf8pf!w1t4=YZj~
zRB1z;d*G=JBDUA(C3C>iSKf>dnR;ubUNOt!zpEH<<n!{U$8xp&A9-=7TJ|4(N<>V0
zk52yc`i0Lc9`zw#l*D@)qD#W_AB0YS8~U9V2aEld)0r7I@H67ziG|MJFFO7?-QxS^
zE;u*@hS;aYsS^yb(dh-Y3)0VuH=KUW>CB76{d3}ACu?JN<o5UrlBvzt&i>%Ptj)VD
zPOZe4JYK&d<ePGUyDIsLI6ArC66ateHafe=nNw7HPF=i#9K4wr><_*<$qjLI;?0Xw
zXG26h^aT+%da)?p5OL<TA$+^U#y<8{&AXDPMEHn-zT|A=c+bh)^Zog7!hcON`Nn;(
znolHi{F_%L6Q5ZU@1{8T$^P@-K!1Jw+fE1nwUeor`p}!shJRf$@$s`un@;w-_^ote
zW9L44%h`Os`_euBJITbO_xOq16;U(!9*N^;KKS8JM8^Dj*W<UPfw`fcbC1{@>i9>N
zns`&c?BZ)8_Lm*KEhK$8FT#FDH~4PQJ^rF(@a(9^Uy_U+JiCkzp4q)GS`zvA%;^JX
zZz>z}`$)7P0)vnF5*zHtBK$q4^Z$a4_{@4m#13QU4s++f20Iw$|CxxIeOz{7&Dpnw
z;my}Y+{5l`zajbmwSO)fc4}vrz7YA^@%eWW^GoOd&E>cyojlm-72h>B@-d4$BI;!S
zd~feMJ9zdK9sIiZHzMlu?_yUroE?1A=^lSiI(R=j@NE%xFzjAOL=E>v)W9A-5Mkfa
zo9W#{XT#26*G_2@iMQo+-UzNK`y=tkA|JOanb>vlp7V8;pV;3!8$0b|K9x)kV&d<r
Z4!)-y5%rT3%(jSkx5V-Nt6Mik{{ggZ_4xn*

delta 929
zcmYL{L2DCH6oubpCX-Bb(xx>@$0nf|P-|-1U4&>ci?oWMLZKk8Dy<u118HrSS-2O<
zgD(0Ly40T_xb#2x2i)kwO~La`-spwHd*{4!-@EtD{HR?m*5-dlCJjH=E*RsPl8Mce
zv)acbmb@s`h1<eIVIU08KL46t(}oC5-emiegURvB@sYG3)jXYlIQj3%i64$9@ApP%
zVe0XvosK7?eG(OU<LiB6o*uFf(gJ2VM=7V6z0sS}!TuOS-ZZ{!<z9H+(4PC90huj<
z*ml`)UV)Ph4;*i3y(JKwH*7BW>IL>&@Ju%@<ljwOu1<|clQD)BtjK*`D?QSG-*GBH
ztBRMkt~lOtd`_Goe_ktI?jygbm4Q>O^S8_m5eAnTXaPfFBC}+>Vf$4gwj?yA-%L+t
z*Dq^NppgxyVWKYH)EWxhMw<+VQYag}X)nSZuWWyYy$CHW$#x6%%B-=#tV<;lyIbhV
z`Ki#4dFipVq2SxyVtY!P6@k&v{v$bfXF)*UR0aHl@PWQ4{;GhV?lXVQ>G&BF9RD4y
zcLn~@?0za-o$2;Zu`)!5-xIix^ZUY@u;X~wY1~O?8v^q}CnvGbqq-N{w^2X(_l~`c
vmQ&V~YtDX;I#s?<U&wmd)IPT5((8>a?Wi*As;&LDfKFG;41T5G;(_oN3gAe~

diff --git a/Assets/Shaders/TestCube_VS.glsl b/Assets/Shaders/TestCube_VS.glsl
index 1b45c333..07b89b6b 100644
--- a/Assets/Shaders/TestCube_VS.glsl
+++ b/Assets/Shaders/TestCube_VS.glsl
@@ -20,11 +20,12 @@ layout(location = 0) out struct
   vec2 uv; // location = 1
   vec4 normal; // location = 2
   vec4 worldPos; // location = 3 
+  vec3 worldNormal; // location = 4 
 
 } Out;
 
 // material stuff
-layout(location = 4) out struct
+layout(location = 5) out struct
 {
   int materialIndex;
   uint eid;
@@ -57,11 +58,13 @@ void main()
   // uvs for texturing in fragment shader
   Out.uv = aUV;
 
-  mat3 transposeInv = mat3 (transpose(inverse(modelViewMat)));
+  mat3 mvTransInv = mat3 (transpose(inverse(modelViewMat)));
+  mat3 modelTransInv = mat3 (transpose(inverse(worldTransform)));
 
   // normals are also in view space
-  Out.normal.rgb = transposeInv * aNormal.rgb;
+  Out.normal.rgb = mvTransInv * aNormal.rgb;
   Out.normal.rgb = normalize (Out.normal.rgb);
+  Out.worldNormal = normalize (modelTransInv * aNormal);
 
   // clip space for rendering
   gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f);
diff --git a/Assets/Shaders/TestCube_VS.shshaderb b/Assets/Shaders/TestCube_VS.shshaderb
index 1bb76ec42331e3ece2cf26e15e72fbbb613e2633..e607761c64bec9e2e8ee7eabc6921c6bed9b9f1b 100644
GIT binary patch
literal 4585
zcmZ9Nd3zI86vn4*5|Dk7Ma7!5Xi*f9rJ~3VhGL;XN>Ne6m<(YsnZ#ro7EwVFccpdz
zI(`yAhX43HzP~$j!aUqQZ_hdJS?;;pWayu@o*N^><4Zhm$Xn*E^!`dHZ>={h#`BhY
z1t-hX=cjk{;`)xg`*sns${TT!#H{w#IX$QUEkBGfmI*6`$AuS#J;J1LT4)IOg+<{v
z;Sb?YVMKq!l7FjcP8G`2)$+_tdHQ6v*6CDx@y%vXZH7@$t%u#97Ki<SxTTr6Fse1@
z>)C+3BC>tuHOErT!6<l3271engKp?Ir=ogr!}+Mpu6SM$)(5fl*9;q1<7xk9&`qM5
zgZ0kL$GauGyy~*{MzcB<^<qD&1y)wRyxWs7ii1YbJ>kc`n1Z)e@vU|}XwHSf^)r5)
z)X96#N;&Sgg0AmE6<Kf`{!Y6W#$ns-cR^K%rQd!hDPSBu_tUb*aeAF@`x=q-G$Ff|
znTMV@x9jb0vp(DPqu!Nvx5e5<yqCo@sAYOT=*E?HPh8G%^fBLm7()+{D)>#ff{URC
zSD!=;<2f(KpG^{&ll!Cnb-i+r{5ee++;ExrxmW&$Ip?oPZ}nZ%Q;~XLEtlZf--opL
zoV$zuV4i|^PjNc8O3+Ovkm>q@XW+AK=l;O6R>$j5&xf~kE6GWGtXsb0&9HMKOzy(K
z$NKTjH=6?=YvFA$I2YcCKkG-0AWH8<!Mz#(SUciYg|)!#9c$zrIsRh64IS{jtt(--
z7pFN~@N#-*N8LP$&7EB?Y!~qJcJcELPN^5}7h^mT;&OvKmltO-><2Mx9^v$nNx3AC
zy~*ZblgIg4Ex1SX*tcvRHhB*O%Y(DLvi6kTsl~du>th0anq894z~<hwZtfvAcMqF^
z&Hc;T+&yfo*GO&VqaV9F>@CAM;^C0SkpoBn#-YO{{fxMJwifOOa}z^vd{40-OKt81
zHs2@w+y!jvt=EoFr=)E1(KjfjAXyaX3!8n!W{he*+y`Rd6JO5FM-6-jl*9bY3Aa71
z$()R$>=lyKrw;Mh+&?({t0l?BZ~6RO;ol_xI!WfHXX4jO;)ACiHuo2fd}22U4B|IR
z;<Nsrkj{MAHs4dysc-pPq?5Bzkwr;BFQruHd^XD-lZ3-&u5n4~!jEc2+(rD@2I8KR
zJuKj74cHSYhkskDlY_loa!9}?9-F%hM_)T7ivl&VccnJ#992hryGsIbNRY(jyxr1?
zBZk`8yaPDq-X}RE5RV_5cLB$K6(#ozo_FUk@rR_5TM}%4kE9&_De2_W3-z#hS8({J
zCCSIn9-ozDZtG`8I(rOn{WPRo{x#`I?8EbHi(_xBpWD*y%<iV~%&|r6my$)NCuew1
zdMV}bCH|cEm2~F8PaoL#Q_lKYlucip$uE-hZS($``rwJj=1mjNKK!2Q%#9zLH;x~h
zd(9iip43}qebi>q*S})&lEjWnZWWjxn?0;NV)MI+|DgQ5#Z?0D^r)(=mRuw7&UxF1
zGy^s<_~~Vnz&qsaQG;5W1$bh3cTWn`;C)jAn;5I{v~+6l{;USyFnFu+jC5-7W~qTq
z41V6t^TLFHpBlWG7X)~-Uy{!ISyT@G9Re}%)MT&VEPk(aIBf38E5f93PWeU2R|PnR
zaj!{-<9v)ekaC<=MLSfId|e=)c>KJj1=YoOP+)FiSRZfeu)zDYbHFCfdOa$gwOOyn
zq-T3QE*p+veVvdFm+kdr%4K_fLmc_U<Inb5md)J6Sg)s~)9Vp|eZ?k@-gZj9DV!FF
z=iQ$Xh`0NJO^mJWoOI4%g>LAW<XZwgqvM-R&-=V|e5|kJc+Z1l%;=YkGrS<orjT%T
zSgYmCNhgQ;mUB@$JYe9<=DaPN95~B)M>;%USWZQ2I4k>IfnKOhEc;ZEgtv9SC!I63
zb-yp2I;<O?t@{J%_-qYT>2M6|=dyHoz_5NS#}`Kqyybi-9Ud_7W!GJkO-^>*b=mNM
zVL7($K-^`4+QhQ%OOo)co4vUruou{z*;Sz-Ea+UZLxC9hquS4Fk{=0s1l~X2BGy%u
zYzo9Pn2R_#%WFxuye-l#FOp6k{gX!=oaJ?-TOPkNmiMuA^4Jsdh=a4Y(Uop_tgj@y
zC&1gj$0-NTus!4+u>Sd!<1G?vJ@utq?d%?07f%j@o`{39yc^OjFS`df#oJuu5eH{^
zw=#LzJ@_QevppaV&d&E!>72Qp?`P7p=li*AV&HAfccilqtQkN1c~|laf!=Qm^oV^&
zz`srMYhglID=^=f<TnDm+22a%o!RfgchZT0w;sQjJ}KBa{~#TXVcd_>;po%2pHhy!
puy6m*(#a<t|9)XX{gxyj2+U86-I)dH_l4yGYs4n*Kh3mX_#bGCaVG!(

literal 4133
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

diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index bbbbd1dd..54e5a1ff 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -141,25 +141,28 @@ namespace SHADE
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Text_VS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Trajectory_VS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/Trajectory_FS.glsl", false);
+    //SHAssetManager::CompileAsset("../../Assets/Shaders/ShadowMapBlur_CS.glsl", false);
+    //SHAssetManager::CompileAsset("../../Assets/Shaders/Anim_VS.glsl", false);
 
     // Load Built In Shaders
-    static constexpr AssetID VS_DEFAULT    = 39210065;  defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
-    static constexpr AssetID VS_ANIM       = 47911992;  animtVertShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_ANIM);
-    static constexpr AssetID FS_DEFAULT    = 46377769;  defaultFragShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
-    static constexpr AssetID VS_DEBUG      = 48002439;  debugVertShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEBUG);
-    static constexpr AssetID FS_DEBUG      = 36671027;  debugFragShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEBUG);
-    static constexpr AssetID VS_DEBUG_MESH = 42127043;  debugMeshVertShader     = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEBUG_MESH);
-    static constexpr AssetID CS_COMPOSITE  = 45072428;  deferredCompositeShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(CS_COMPOSITE);
-    static constexpr AssetID SSAO          = 38430899;  ssaoShader              = SHResourceManager::LoadOrGet<SHVkShaderModule>(SSAO);
-    static constexpr AssetID SSAO_BLUR     = 39760835;  ssaoBlurShader          = SHResourceManager::LoadOrGet<SHVkShaderModule>(SSAO_BLUR);
-    static constexpr AssetID TEXT_VS       = 39816727;  textVS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_VS);
-    static constexpr AssetID TEXT_FS       = 38024754;  textFS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_FS);
-    static constexpr AssetID RENDER_SC_VS  = 48082949;  renderToSwapchainVS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_VS);
-    static constexpr AssetID RENDER_SC_FS  = 36869006;  renderToSwapchainFS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_FS);
-    static constexpr AssetID SHADOW_MAP_VS = 44646107;  shadowMapVS             = SHResourceManager::LoadOrGet<SHVkShaderModule>(SHADOW_MAP_VS);
-    static constexpr AssetID SHADOW_MAP_FS = 45925790;  shadowMapFS             = SHResourceManager::LoadOrGet<SHVkShaderModule>(SHADOW_MAP_FS);
-    static constexpr AssetID TRAJECTORY_VS = 41042628;  trajectoryVS            = SHResourceManager::LoadOrGet<SHVkShaderModule>(TRAJECTORY_VS);
-    static constexpr AssetID TRAJECTORY_FS = 45635685;  trajectoryFS            = SHResourceManager::LoadOrGet<SHVkShaderModule>(TRAJECTORY_FS);
+    static constexpr AssetID VS_DEFAULT     = 39210065;  defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
+    static constexpr AssetID VS_ANIM        = 47911992;  animtVertShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_ANIM);
+    static constexpr AssetID FS_DEFAULT     = 46377769;  defaultFragShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
+    static constexpr AssetID VS_DEBUG       = 48002439;  debugVertShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEBUG);
+    static constexpr AssetID FS_DEBUG       = 36671027;  debugFragShader         = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEBUG);
+    static constexpr AssetID VS_DEBUG_MESH  = 42127043;  debugMeshVertShader     = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEBUG_MESH);
+    static constexpr AssetID CS_COMPOSITE   = 45072428;  deferredCompositeShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(CS_COMPOSITE);
+    static constexpr AssetID SSAO           = 38430899;  ssaoShader              = SHResourceManager::LoadOrGet<SHVkShaderModule>(SSAO);
+    static constexpr AssetID SSAO_BLUR      = 39760835;  ssaoBlurShader          = SHResourceManager::LoadOrGet<SHVkShaderModule>(SSAO_BLUR);
+    static constexpr AssetID TEXT_VS        = 39816727;  textVS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_VS);
+    static constexpr AssetID TEXT_FS        = 38024754;  textFS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_FS);
+    static constexpr AssetID RENDER_SC_VS   = 48082949;  renderToSwapchainVS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_VS);
+    static constexpr AssetID RENDER_SC_FS   = 36869006;  renderToSwapchainFS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_FS);
+    static constexpr AssetID SHADOW_MAP_VS  = 44646107;  shadowMapVS             = SHResourceManager::LoadOrGet<SHVkShaderModule>(SHADOW_MAP_VS);
+    static constexpr AssetID SHADOW_MAP_FS  = 45925790;  shadowMapFS             = SHResourceManager::LoadOrGet<SHVkShaderModule>(SHADOW_MAP_FS);
+    static constexpr AssetID TRAJECTORY_VS  = 41042628;  trajectoryVS            = SHResourceManager::LoadOrGet<SHVkShaderModule>(TRAJECTORY_VS);
+    static constexpr AssetID TRAJECTORY_FS  = 45635685;  trajectoryFS            = SHResourceManager::LoadOrGet<SHVkShaderModule>(TRAJECTORY_FS);
+    static constexpr AssetID SHADOW_BLUR_CS = 38004013;  shadowMapBlurCS         = SHResourceManager::LoadOrGet<SHVkShaderModule>(SHADOW_BLUR_CS);
 
   }
 
@@ -217,7 +220,7 @@ namespace SHADE
     renderGraph->AddResource("Albedo", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second);
     renderGraph->AddResource("Depth Buffer", { SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT }, true, windowDims.first, windowDims.second, vk::Format::eD32SfloatS8Uint);
     renderGraph->AddResource("Entity ID", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::SHARED }, true, windowDims.first, windowDims.second, vk::Format::eR32Uint, 1, vk::ImageUsageFlagBits::eTransferSrc);
-    renderGraph->AddResource("Light Layer Indices", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32Uint, 1, vk::ImageUsageFlagBits::eTransferSrc);
+    renderGraph->AddResource("Light Layer Indices And World Normals", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR32G32B32A32Uint, 1, vk::ImageUsageFlagBits::eTransferSrc);
     renderGraph->AddResource("Scene", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE, SH_RENDER_GRAPH_RESOURCE_FLAGS::SHARED }, true, windowDims.first, windowDims.second);
     renderGraph->AddResource("SSAO", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR8Unorm);
     renderGraph->AddResource("SSAO Blur", { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, true, windowDims.first, windowDims.second, vk::Format::eR8Unorm);
@@ -231,7 +234,7 @@ namespace SHADE
       {
         "Position",
         "Entity ID",
-        "Light Layer Indices",
+        "Light Layer Indices And World Normals",
         "Normals",
         "Albedo",
         "Depth Buffer",
@@ -248,7 +251,7 @@ namespace SHADE
     auto gBufferSubpass = gBufferNode->AddSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS.data(), worldViewport, worldRenderer);
     gBufferSubpass->AddColorOutput("Position");
     gBufferSubpass->AddColorOutput("Entity ID");
-    gBufferSubpass->AddColorOutput("Light Layer Indices");
+    gBufferSubpass->AddColorOutput("Light Layer Indices And World Normals");
     gBufferSubpass->AddColorOutput("Normals");
     gBufferSubpass->AddColorOutput("Albedo");
     gBufferSubpass->AddColorOutput("Position World Space");
@@ -258,7 +261,7 @@ namespace SHADE
     auto gBufferVfxSubpass = gBufferNode->AddSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_VFX_SUBPASS.data(), worldViewport, worldRenderer);
     gBufferVfxSubpass->AddColorOutput("Position");
     gBufferVfxSubpass->AddColorOutput("Entity ID");
-    gBufferVfxSubpass->AddColorOutput("Light Layer Indices");
+    gBufferVfxSubpass->AddColorOutput("Light Layer Indices And World Normals");
     gBufferVfxSubpass->AddColorOutput("Normals");
     gBufferVfxSubpass->AddColorOutput("Albedo");
     gBufferVfxSubpass->AddColorOutput("Position World Space");
@@ -314,7 +317,7 @@ namespace SHADE
     auto deferredCompositeNode = renderGraph->AddNode(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_PASS.data(),
       {
         "Position",
-        "Light Layer Indices",
+        "Light Layer Indices And World Normals",
         "Normals",
         "Albedo",
         "Scene",
@@ -327,7 +330,7 @@ namespace SHADE
     /*-----------------------------------------------------------------------*/
     /* DEFERRED COMPOSITE SUBPASS INIT                                       */
     /*-----------------------------------------------------------------------*/
-    auto deferredCompositeCompute = deferredCompositeNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data(), deferredCompositeShader, {"Position", "Normals", "Albedo", "Light Layer Indices", "SSAO Blur", "Position World Space", "Scene", "Object VFX"}, {}, SHLightingSubSystem::MAX_SHADOWS);
+    auto deferredCompositeCompute = deferredCompositeNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data(), deferredCompositeShader, {"Position", "Normals", "Albedo", "Light Layer Indices And World Normals", "SSAO Blur", "Position World Space", "Scene", "Object VFX"}, {}, SHLightingSubSystem::MAX_SHADOWS);
     deferredCompositeCompute->AddPreComputeFunction([=](Handle<SHVkCommandBuffer> cmdBuffer, uint32_t frameIndex)
       {
         lightingSubSystem->PrepareShadowMapsForRead(cmdBuffer);
@@ -669,21 +672,21 @@ namespace SHADE
 #endif
     }
 
-    //static bool shadowAdded = false;
+    static bool shadowAdded = false;
 
-    //if (shadowAdded == false && SHInputManager::GetKey(SHInputManager::SH_KEYCODE::B))
-    //{
-    //  shadowAdded = true;
-    //  auto& lightComps = SHComponentManager::GetDense<SHLightComponent>();
-    //  //if (lightComps.size() > 2)
-    //  //{
-    //  //  lightComps[2].SetEnableShadow(true);
-    //  //}
-    //  for (auto& comp : lightComps)
-    //  {
-    //    comp.SetEnableShadow(true);
-    //  }
-    //}
+    if (shadowAdded == false && SHInputManager::GetKey(SHInputManager::SH_KEYCODE::B))
+    {
+      shadowAdded = true;
+      auto& lightComps = SHComponentManager::GetDense<SHLightComponent>();
+      if (lightComps.size() > 2)
+      {
+        lightComps[2].SetEnableShadow(true);
+      }
+      for (auto& comp : lightComps)
+      {
+        comp.SetEnableShadow(true);
+      }
+    }
 
     renderGraph->Begin(frameIndex);
     auto cmdBuffer = renderGraph->GetCommandBuffer(frameIndex);
@@ -866,6 +869,7 @@ namespace SHADE
     auto*             lightComp             = SHComponentManager::GetComponent<SHLightComponent>(EVENT_DATA->lightEntity);
     std::string       depthResourceName     = "ShadowMap_Depth " + std::to_string(EVENT_DATA->lightEntity);
     std::string       shadowMapResourceName = "ShadowMap " + std::to_string(EVENT_DATA->lightEntity);
+    std::string       shadowMapBlurredResourceName = "ShadowMap Blurred" + std::to_string(EVENT_DATA->lightEntity);
     Handle<SHSubpass> companionSubpass  = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data())->GetSubpass(SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_WRITE_SUBPASS);
 
     if (EVENT_DATA->generateRenderer)
@@ -878,17 +882,31 @@ namespace SHADE
       lightComp->SetShadowMapIndex (lightingSubSystem->GetNumShadowMaps());
     }
 
+
     // Add the shadow map resource to the graph
     renderGraph->AddResource(depthResourceName, {SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH}, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eD32Sfloat);
-    renderGraph->AddResource(shadowMapResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eR32G32B32A32Sfloat);
+    renderGraph->AddResource(shadowMapResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eR32G32B32A32Sfloat);
+    renderGraph->AddResource(shadowMapBlurredResourceName, { SH_RENDER_GRAPH_RESOURCE_FLAGS::COLOR, SH_RENDER_GRAPH_RESOURCE_FLAGS::INPUT, SH_RENDER_GRAPH_RESOURCE_FLAGS::STORAGE }, false, SHLightingSubSystem::SHADOW_MAP_WIDTH, SHLightingSubSystem::SHADOW_MAP_HEIGHT, vk::Format::eR32G32B32A32Sfloat);
+
+
 
     // link resource to node. This means linking the resource and regenerating the node's renderpass and framebuffer.
-    auto shadowMapNode = renderGraph->AddNodeAfter(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, {depthResourceName.c_str(), shadowMapResourceName.c_str()}, SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data());
+    auto shadowMapNode = renderGraph->AddNodeAfter(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, {depthResourceName.c_str(), shadowMapResourceName.c_str(), shadowMapBlurredResourceName.c_str()}, SHGraphicsConstants::RenderGraphEntityNames::GBUFFER_PASS.data());
 
     // Add a subpass to render to that shadow map
-    auto newSubpass = shadowMapNode->RuntimeAddSubpass(shadowMapResourceName + " Subpass", shadowMapViewport, lightComp->GetRenderer());
-    newSubpass->AddColorOutput(shadowMapResourceName);
-    newSubpass->AddDepthOutput(depthResourceName, SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH);
+    auto shadowMapDrawSubpass = shadowMapNode->RuntimeAddSubpass(shadowMapResourceName + " Subpass", shadowMapViewport, lightComp->GetRenderer());
+    shadowMapDrawSubpass->AddColorOutput(shadowMapResourceName);
+    shadowMapDrawSubpass->AddDepthOutput(depthResourceName, SH_RENDER_GRAPH_RESOURCE_FLAGS::DEPTH);
+
+    // add dummy subpass to transition the shadow map images for compute shader usage
+    //auto dummySubpass = shadowMapNode->RuntimeAddSubpass(shadowMapResourceName + "Dummy", {}, {});
+    //dummySubpass->AddGeneralColorOutput(shadowMapResourceName);
+    //dummySubpass->AddGeneralColorOutput(shadowMapBlurredResourceName);
+
+    // add compute pass to blur shadow ma
+    shadowMapNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, shadowMapBlurCS, { shadowMapResourceName.c_str(), shadowMapBlurredResourceName.c_str() });
+    //shadowMapNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, shadowMapBlurCS, { shadowMapBlurredResourceName.c_str(), shadowMapResourceName.c_str() });
+    //shadowMapNode->AddNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::SHADOW_MAP_PASS.data() + shadowMapResourceName, shadowMapBlurCS, { shadowMapResourceName.c_str(), shadowMapBlurredResourceName.c_str() });
 
     // regenerate the node
     shadowMapNode->RuntimeStandaloneRegenerate();
@@ -905,16 +923,16 @@ namespace SHADE
       tempLibrary.Init(device);
       tempLibrary.CreateGraphicsPipelines
       (
-        { shadowMapVS, shadowMapFS }, shadowMapNode->GetRenderpass(), newSubpass, 
+        { shadowMapVS, shadowMapFS }, shadowMapNode->GetRenderpass(), shadowMapDrawSubpass, 
         SHGraphicsPredefinedData::SystemType::BATCHING, 
         SHGraphicsPredefinedData::GetShadowMapViState(), rasterState
       );
-      shadowMapPipeline = tempLibrary.GetGraphicsPipeline({ shadowMapVS, shadowMapFS, newSubpass });
+      shadowMapPipeline = tempLibrary.GetGraphicsPipeline({ shadowMapVS, shadowMapFS, shadowMapDrawSubpass });
     }
-    newSubpass->SetCompanionSubpass(companionSubpass, shadowMapPipeline); // set companion subpass and pipeline 
+    shadowMapDrawSubpass->SetCompanionSubpass(companionSubpass, shadowMapPipeline); // set companion subpass and pipeline 
     
-    // add the shadow map to the lighting system
-    uint32_t const NEW_SHADOW_MAP_INDEX = lightingSubSystem->AddShadowMap(renderGraph->GetRenderGraphResource(shadowMapResourceName), EVENT_DATA->lightEntity);
+    // add the shadow map and the blurred version to the lighting system
+    uint32_t const NEW_SHADOW_MAP_INDEX = lightingSubSystem->AddShadowMap(renderGraph->GetRenderGraphResource(shadowMapBlurredResourceName), EVENT_DATA->lightEntity);
 
     auto nodeCompute = renderGraph->GetNode(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_PASS.data())->GetNodeCompute(SHGraphicsConstants::RenderGraphEntityNames::DEFERRED_COMPOSITE_COMPUTE.data());
     nodeCompute->ModifyWriteDescImageComputeResource(SHGraphicsConstants::DescriptorSetBindings::SHADOW_MAP_IMAGE_SAMPLER_DATA, lightingSubSystem->GetViewSamplerLayout(NEW_SHADOW_MAP_INDEX), NEW_SHADOW_MAP_INDEX);
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
index 0b98f843..33227f8f 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
@@ -481,6 +481,7 @@ namespace SHADE
     Handle<SHVkShaderModule>                                  shadowMapFS;
     Handle<SHVkShaderModule>                                  trajectoryVS;
     Handle<SHVkShaderModule>                                  trajectoryFS;
+    Handle<SHVkShaderModule>                                  shadowMapBlurCS;
 
     // Fonts
     Handle<SHFont>                                            testFont;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
index cace495c..cd308487 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp
@@ -53,7 +53,8 @@ namespace SHADE
       SHVec4 transformedDir = SHMatrix::Transpose(viewMat) * SHVec4(lightData.direction[0], lightData.direction[1], lightData.direction[2], 0.0f);
 
       lightPtr->cullingMask = lightData.cullingMask;
-      lightPtr->direction = SHVec3 (transformedDir.x, transformedDir.y, transformedDir.z);
+      lightPtr->directionWorld = SHVec4 (lightData.direction.x, lightData.direction.y, lightData.direction.z, 1.0f);
+      lightPtr->direction = SHVec3(transformedDir.x, transformedDir.y, transformedDir.z);
       //lightPtr->direction = lightData.direction;
       lightPtr->diffuseColor = lightData.color;
       lightPtr->active = lightComp->isActive;
@@ -601,14 +602,14 @@ namespace SHADE
 
   }
 
-  uint32_t SHLightingSubSystem::AddShadowMap(Handle<SHRenderGraphResource> newShadowMap, EntityID lightEntity) noexcept
+  uint32_t SHLightingSubSystem::AddShadowMap(Handle<SHRenderGraphResource> newShadowMapBlurred, EntityID lightEntity) noexcept
   {
     // Add to container of shadow maps
     shadowMapIndexing.emplace(lightEntity, static_cast<uint32_t> (shadowMaps.size()));
-    shadowMaps.emplace_back(newShadowMap);
+    shadowMaps.emplace_back(newShadowMapBlurred);
 
     // Just use the image view stored in the resource
-    Handle<SHVkImageView> const NEW_IMAGE_VIEW = newShadowMap->GetImageView();
+    Handle<SHVkImageView> const NEW_IMAGE_VIEW = newShadowMapBlurred->GetImageView();
 
     // Prepare to write to descriptor
     shadowMapImageSamplers.emplace_back(NEW_IMAGE_VIEW, shadowMapSampler, vk::ImageLayout::eShaderReadOnlyOptimal);
@@ -634,13 +635,13 @@ namespace SHADE
     // add to barriers
     shadowMapMemoryBarriers.push_back (vk::ImageMemoryBarrier
       {
-        .srcAccessMask = vk::AccessFlagBits::eColorAttachmentWrite | vk::AccessFlagBits::eColorAttachmentRead,
+        .srcAccessMask = vk::AccessFlagBits::eShaderWrite,
         .dstAccessMask = vk::AccessFlagBits::eShaderRead,
-        .oldLayout = vk::ImageLayout::eColorAttachmentOptimal,
-        .newLayout = vk::ImageLayout::eShaderReadOnlyOptimal,
+        .oldLayout = vk::ImageLayout::eGeneral,
+        .newLayout = vk::ImageLayout::eGeneral,
         .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
         .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .image = newShadowMap->GetImage()->GetVkImage(),
+        .image = newShadowMapBlurred->GetImage()->GetVkImage(),
         .subresourceRange = vk::ImageSubresourceRange
         {
           .aspectMask = vk::ImageAspectFlagBits::eColor, 
@@ -658,7 +659,7 @@ namespace SHADE
   void SHLightingSubSystem::PrepareShadowMapsForRead(Handle<SHVkCommandBuffer> cmdBuffer) noexcept
   {
     // Issue barrier to transition shadow maps for reading in compute shader
-    cmdBuffer->PipelineBarrier(vk::PipelineStageFlagBits::eColorAttachmentOutput, vk::PipelineStageFlagBits::eComputeShader, {}, {}, {}, shadowMapMemoryBarriers);
+    cmdBuffer->PipelineBarrier(vk::PipelineStageFlagBits::eComputeShader, vk::PipelineStageFlagBits::eComputeShader, {}, {}, {}, shadowMapMemoryBarriers);
   }
 
   //void SHLightingSubSystem::HandleResize(Handle<SHRenderGraphNodeCompute> compute) noexcept
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.h
index 69b00f2c..3613f762 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.h
@@ -28,6 +28,9 @@ namespace SHADE
   // Represents how the data will be interpreted in GPU. we want to copy to a container of these before passing to GPU.
   struct SHDirectionalLightData 
   {
+    //! Direction of the light
+    SHVec4 directionWorld;
+
     //! Direction of the light
     SHVec3 direction;
 
@@ -213,7 +216,7 @@ namespace SHADE
     void Run                      (SHMatrix const& viewMat, uint32_t frameIndex) noexcept;
     void Exit                     (void) noexcept;
     void BindDescSet              (Handle<SHVkCommandBuffer> cmdBuffer, uint32_t setIndex, uint32_t frameIndex) noexcept;
-    uint32_t AddShadowMap         (Handle<SHRenderGraphResource> newShadowMap, EntityID lightEntity) noexcept;
+    uint32_t AddShadowMap         (Handle<SHRenderGraphResource> newShadowMapBlurred, EntityID lightEntity) noexcept;
     void PrepareShadowMapsForRead (Handle<SHVkCommandBuffer> cmdBuffer) noexcept;
     //void HandleResize             (Handle<SHRenderGraphNodeCompute> compute) noexcept;
     //void RemoveShadowMap (uint32_t index) noexcept;
diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp
index 34bfe8cd..36d2e20a 100644
--- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp
+++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp
@@ -798,6 +798,7 @@ namespace SHADE
   /***************************************************************************/
   void SHRenderGraphNode::RuntimeStandaloneRegenerate(void) noexcept
   {
+    AddDummySubpassIfNeeded();
     StandaloneConfigureAttDesc(false);
     ConfigureSubpasses();
     CreateRenderpass();