From 73c5a0ff4a2e0e69ad37aa553f53eb4a044f539e Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Sat, 4 Mar 2023 23:12:12 +0800 Subject: [PATCH] Updated shadow shaders --- Assets/Shaders/DeferredComposite_CS.glsl | 2 +- Assets/Shaders/DeferredComposite_CS.shshaderb | Bin 10101 -> 10085 bytes Assets/Shaders/ShadowMap_FS.glsl | 8 +++++++- Assets/Shaders/ShadowMap_FS.shshaderb | Bin 789 -> 1229 bytes 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Shaders/DeferredComposite_CS.glsl b/Assets/Shaders/DeferredComposite_CS.glsl index 12352d4d..2cf33ae1 100644 --- a/Assets/Shaders/DeferredComposite_CS.glsl +++ b/Assets/Shaders/DeferredComposite_CS.glsl @@ -83,7 +83,7 @@ float CalcShadowValue (sampler2D shadowMap, vec4 worldSpaceFragPos, mat4 lightPV return 0.0f; } else - return 0.3f; + return 1.0f; // return step (fragPosLightPOV.z, ); } diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb index a5197b3bb424b07718a21240adc9134a72f08195..e0b019b110f203343587a12900cb4cdfacd2b8c4 100644 GIT binary patch literal 10085 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 K_e|_>oc{p)UnD;O diff --git a/Assets/Shaders/ShadowMap_FS.glsl b/Assets/Shaders/ShadowMap_FS.glsl index b19a32a6..59904b5e 100644 --- a/Assets/Shaders/ShadowMap_FS.glsl +++ b/Assets/Shaders/ShadowMap_FS.glsl @@ -7,6 +7,12 @@ layout(location = 0) out vec4 shadowMap; void main() { + float depth = gl_FragCoord.z; + + float dx = dFdx(depth); + float dy = dFdy(depth); + + float moment2 = depth * depth + 0.25f * (dx * dx + dy * dy); // shadowMap = vec4 (0.0f, 0.0f, gl_FragCoord.z, 1.0f); - shadowMap = vec4 (gl_FragCoord.z, gl_FragCoord.z * gl_FragCoord.z, 0.0f, 1.0f); + shadowMap = vec4 (gl_FragCoord.z, moment2, 0.0f, 1.0f); } \ No newline at end of file diff --git a/Assets/Shaders/ShadowMap_FS.shshaderb b/Assets/Shaders/ShadowMap_FS.shshaderb index 709a2ecc8a2443df79dbbed62ab544a4ac5cc464..78d304c1c888675793ea571220284d752acb2677 100644 GIT binary patch literal 1229 zcmZ9K-A@xi6vao{@=*k;2>5Lg#SfGag2u#%L4$oM!Ke?uP1f#GR@>cmyH$C^2mdkS zyZ$-8n0S86Oj6zCX3jbH%)K*rr}3j|%C9oEGGWXqQ#Ui_{)uGHm@z5FOq=m?ZM9#w z*9S$ozV%=O%dDxCPCRpF!cdCn2XR7TTCu8V$cL^5LKRgt=DRjk&6H`i?ar%bb`WJj z9u$!s90p;O+w|T0s8bC7^(Yl5UE2$i?l9;^c58DZ3pyWEXOcR*Z{OG?O@>K)kmh~+ zaTxUCgE-2Suaj@>@3-2!wv%OcP#pCl+l!OPhHlTL3Kjv8umjNT7E zsk?+xRvc=rX-?d^+p{n7p!+;c^H5ZJMYELe%LzUQJ_1+Gl5jumM@g|MUMuIt4AReg zL8e?w9%>SEjx*D%3ch(wlX)(elQkt?6dsq>ETdY^o!O%;sos>s+@&dA*UCRcf9yE@ z&=$l`Yi%m{)*PP^rZ4+vwc@2ddDcq`V~)4U-xT7d`1lem)>yiT@c3m%Xt@t(eQFExc8nH#_Rb7$G_>Eoav$h54!hU7N)1?R~+|ycqe$! zz2}-Ry*+O_?)NN<<3a!GdS4f&7CG-*5#~RW^S&FxoRb`PWY%bY*0+TJpY?5N=>9x+ dgxU8}e~CA9Pk{%Wcf#ACHgAaBAHBXuioZ{gZEXMm delta 327 zcmZvWJqp4=6og+k#`u?*_>(B22(j}5f<&+q6u~Pf7Iq32mR24hEH)m-8+Zhd5^yHQ z&V_G(=DjyNukyVZcr{b9Wva*)F{C1nbdz9Vl_6J?-MelHujj*df4r=>C%rU!{e=`V zb?_Y)zN;Jnb^SD=ID`U2DS`qRVlUz3chsl(o8Ht|ui!L*tzEV91KhaAsL&?`q`wuc!H^rv;7r4L)>k1I|(3ARY5{fCpG(k`T<06nUMjm?G)~ Fd;m-c7byS$