From eab6b4a2791a033b6a1d6f808928e4ab9989e7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 22 May 2021 13:38:29 +0200 Subject: [PATCH] Update shaders --- bin/resources/deferred_frag.nzsl | 5 ++--- bin/resources/fullscreen.frag.shader | Bin 382 -> 382 bytes bin/resources/fullscreen.vert.shader | Bin 474 -> 474 bytes .../Shaders/basicmaterial.frag.shader | Bin 1909 -> 1909 bytes .../Shaders/basicmaterial.frag.shader.h | 2 +- .../Shaders/basicmaterial.vert.shader | Bin 1365 -> 1365 bytes .../Shaders/basicmaterial.vert.shader.h | 2 +- 7 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/resources/deferred_frag.nzsl b/bin/resources/deferred_frag.nzsl index c1ae6959e..f487e4ce1 100644 --- a/bin/resources/deferred_frag.nzsl +++ b/bin/resources/deferred_frag.nzsl @@ -57,15 +57,14 @@ struct OutputData [entry(frag)] fn main(input: InputData) -> OutputData { - let output: OutputData; - let textureColor = select_opt(HAS_DIFFUSE_TEXTURE, MaterialDiffuseMap.Sample(input.vertUV) * settings.DiffuseColor, settings.DiffuseColor); let alpha = select_opt(HAS_ALPHA_TEXTURE, MaterialAlphaMap.Sample(input.vertUV).x * textureColor.w, 1.0); /*if ((select_opt(ALPHA_TEST, var0.w < settings.AlphaThreshold, false)) == (true)) { discard; }*/ - + + let output: OutputData; output.diffuseMap = textureColor; output.normalMap = vec4((vec3(1.0, 1.0, 1.0) + input.vertNormal) * 0.5, 1.0); output.positionMap = vec4(input.vertPos, 1.0); diff --git a/bin/resources/fullscreen.frag.shader b/bin/resources/fullscreen.frag.shader index 27e9cb993335c5106ceb733df1870d4241f382e0..b97203cc316962369955ef9a520185b6fd68dd2c 100644 GIT binary patch delta 144 zcmeyz^p8ozFW4i9fq{V$h$VoS1&9SFiYPLQOf=I25~*g4LKEk>Fp5rms3<57lw<;8 z7~q^N%&6qa1>}N6L6{SW*+Wt*N=l1TflLqp39)A86_l0$86a!e%2JC;Lc@S8DIf+( Kv*nkT0ObK0vK5;E delta 144 zcmeyz^p8ozFW4i9fq{V$h{b@I1&H}4iYPJ)O*GR35~*g40u$%BFbYq6s3<53lw<;8 z7+{|)%&6qa0px;2L6{wcLsBbBN{do~Ob`GGv1aBKl$HP)AZyslQj1DL!+lwg;8|kJ4Hcppg0o{!vN=G z1x8sRHg+JN1&Be~L4b3zKcl272av^R-@w4|9}0kcOapouk delta 152 zcmcb`e2ZDcFW4i9fq{V$h{b@I8Hj}@ig+>#O^owm6qvZug;99oJ4HcJpg0o{!vOna z1x8sR7Iq+?1&Be~L4bX-Kcl278<53l-@w4|9}0kcOapouWdHyG diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader index 90f866d0bdf658d9b6982f44e660d1328b159d0b..a8ccdac7c9311ca406bc90a667d99b05c9b15cc1 100644 GIT binary patch delta 599 zcmZuuO-lk%6rDF;`W*8kXH=35&0U*19T$;FetxK^GOQTqMpSc)O8cPf94JTq83+B1O*V3 zf5>T`&_aarrk;n~)i#9{QN@J|_15;bfh-wt?QB{PL8$`JNp!waKG8DtclWlmn`s+6 z!P(O1VLH*Und9|sx8e?acEcV*4?`Hb3#RZkQRa-<$a4+{u6PawS^xCo&_i!{jy?@Q zq*8CyD&5XeyE8ut!@8&*+!CiS#H;dmy|9H$5u!ll^b7*l3?TRy$e_F&D&}x9P+P+; LKp%|QaKwH9B%@wp delta 599 zcmZuu%}N4M6rMYO*D?P_M-w7LbJwOI%3Vkn5}J~(qL3jZr2%Ca!(GrD3}@GCv})x# zdV*HHK+q@MWf{eqBnlm|ii+m|~P}ePr{^>X1MJ+^$ga`;6 zKI9A}G|o6Q^c=1oZBs}QUR%=>$-j0DLccSUAKoABNKw|f-br<;&sQ~$n72u95D`ss{V;bF-DpwPdW`m zxLj*i%boU7t3A(%prK!^IP;i!h}Q2)(j2zG$Qy5s^C!Kg*7ps`OLBu LMd*W(Hyn9Co5)@C diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader.h b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader.h index d0446fabc..af5fdbf2d 100644 --- a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader.h +++ b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.frag.shader.h @@ -1 +1 @@ -78,83,72,82,0,0,0,1,0,0,0,22,0,0,0,10,0,0,0,17,0,0,0,0,19,72,65,83,95,68,73,70,70,85,83,69,95,84,69,88,84,85,82,69,1,0,0,0,0,255,255,255,255,0,0,0,17,0,0,0,0,17,72,65,83,95,65,76,80,72,65,95,84,69,88,84,85,82,69,1,0,0,0,0,255,255,255,255,0,0,0,17,0,0,0,0,10,65,76,80,72,65,95,84,69,83,84,1,0,0,0,0,255,255,255,255,0,0,0,18,0,0,0,0,13,66,97,115,105,99,83,101,116,116,105,110,103,115,1,0,0,0,1,0,0,0,2,0,0,0,14,65,108,112,104,97,84,104,114,101,115,104,111,108,100,1,0,0,0,1,0,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,7,0,0,0,4,0,0,0,1,0,0,0,0,18,0,0,0,0,12,73,110,115,116,97,110,99,101,68,97,116,97,1,0,0,0,1,0,0,0,2,0,0,0,11,119,111,114,108,100,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,14,105,110,118,87,111,114,108,100,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,18,0,0,0,0,10,86,105,101,119,101,114,68,97,116,97,1,0,0,0,1,0,0,0,9,0,0,0,16,112,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,19,105,110,118,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,10,118,105,101,119,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,13,105,110,118,86,105,101,119,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,14,118,105,101,119,80,114,111,106,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,17,105,110,118,86,105,101,119,80,114,111,106,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,16,114,101,110,100,101,114,84,97,114,103,101,116,83,105,122,101,7,0,0,0,2,0,0,0,1,0,0,0,0,19,105,110,118,82,101,110,100,101,114,84,97,114,103,101,116,83,105,122,101,7,0,0,0,2,0,0,0,1,0,0,0,0,11,101,121,101,80,111,115,105,116,105,111,110,7,0,0,0,3,0,0,0,1,0,0,0,0,15,0,0,0,0,6,0,0,0,10,118,105,101,119,101,114,68,97,116,97,6,0,0,0,10,86,105,101,119,101,114,68,97,116,97,1,0,0,0,5,0,0,0,12,105,110,115,116,97,110,99,101,68,97,116,97,6,0,0,0,12,73,110,115,116,97,110,99,101,68,97,116,97,1,0,0,0,4,0,0,0,8,115,101,116,116,105,110,103,115,6,0,0,0,13,66,97,115,105,99,83,101,116,116,105,110,103,115,1,0,0,0,3,0,0,0,16,77,97,116,101,114,105,97,108,65,108,112,104,97,77,97,112,4,0,0,0,2,0,0,0,1,1,0,0,0,0,0,0,0,18,77,97,116,101,114,105,97,108,68,105,102,102,117,115,101,77,97,112,4,0,0,0,2,0,0,0,1,1,0,0,0,1,0,0,0,14,84,101,120,116,117,114,101,79,118,101,114,108,97,121,4,0,0,0,2,0,0,0,1,1,0,0,0,2,0,0,0,18,0,0,0,0,9,73,110,112,117,116,68,97,116,97,0,0,0,0,2,0,0,0,10,118,101,114,116,78,111,114,109,97,108,7,0,0,0,3,0,0,0,1,2,0,0,0,0,0,0,0,6,118,101,114,116,85,86,7,0,0,0,2,0,0,0,1,2,0,0,0,1,0,0,0,18,0,0,0,0,10,79,117,116,112,117,116,68,97,116,97,0,0,0,0,1,0,0,0,13,82,101,110,100,101,114,84,97,114,103,101,116,48,7,0,0,0,4,0,0,0,1,2,0,0,0,0,0,0,0,16,0,0,0,4,109,97,105,110,2,0,0,0,10,79,117,116,112,117,116,68,97,116,97,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,5,105,110,112,117,116,2,0,0,0,9,73,110,112,117,116,68,97,116,97,0,0,0,8,0,0,0,19,0,0,0,0,6,111,117,116,112,117,116,2,0,0,0,10,79,117,116,112,117,116,68,97,116,97,255,255,255,255,0,0,0,19,0,0,0,0,8,108,105,103,104,116,68,105,114,0,0,0,0,6,0,0,0,5,0,0,0,0,191,52,253,244,63,52,253,244,0,0,0,19,0,0,0,0,11,108,105,103,104,116,70,97,99,116,111,114,0,0,0,0,8,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,7,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,10,118,101,114,116,78,111,114,109,97,108,0,0,0,7,0,0,0,8,108,105,103,104,116,68,105,114,0,0,0,19,0,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,0,3,0,0,0,2,0,0,0,7,0,0,0,11,108,105,103,104,116,70,97,99,116,111,114,0,0,0,9,0,0,0,19,72,65,83,95,68,73,70,70,85,83,69,95,84,69,88,84,85,82,69,0,0,0,3,0,0,0,2,0,0,0,8,0,0,0,2,0,0,0,2,0,0,0,7,0,0,0,18,77,97,116,101,114,105,97,108,68,105,102,102,117,115,101,77,97,112,0,0,0,0,0,0,0,7,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,6,118,101,114,116,85,86,0,0,0,0,0,0,0,7,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,0,0,0,0,0,0,0,7,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,0,0,0,19,0,0,0,0,4,118,97,114,48,0,0,0,0,9,0,0,0,17,72,65,83,95,65,76,80,72,65,95,84,69,88,84,85,82,69,0,0,0,4,7,0,0,0,4,0,0,0,1,0,0,0,10,0,0,0,1,0,0,0,7,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,0,0,0,0,10,0,0,0,1,0,0,0,7,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,1,0,0,0,10,0,0,0,1,0,0,0,7,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,2,0,0,0,3,0,0,0,2,0,0,0,10,0,0,0,1,0,0,0,8,0,0,0,2,0,0,0,2,0,0,0,7,0,0,0,16,77,97,116,101,114,105,97,108,65,108,112,104,97,77,97,112,0,0,0,0,0,0,0,7,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,6,118,101,114,116,85,86,0,0,0,0,0,0,0,10,0,0,0,1,0,0,0,7,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,3,0,0,0,7,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,13,0,0,0,1,0,0,0,3,0,0,0,4,0,0,0,9,0,0,0,10,65,76,80,72,65,95,84,69,83,84,0,0,0,3,0,0,0,8,0,0,0,10,0,0,0,1,0,0,0,7,0,0,0,4,118,97,114,48,0,0,0,3,0,0,0,0,0,0,0,7,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,14,65,108,112,104,97,84,104,114,101,115,104,111,108,100,0,0,0,6,0,0,0,0,0,0,0,0,6,0,0,0,0,1,0,0,0,20,255,255,255,255,0,0,0,21,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,6,111,117,116,112,117,116,0,0,0,1,0,0,0,13,82,101,110,100,101,114,84,97,114,103,101,116,48,0,0,0,7,0,0,0,4,118,97,114,48,0,0,0,24,0,0,0,7,0,0,0,6,111,117,116,112,117,116, \ No newline at end of file +78,83,72,82,0,0,0,1,0,0,0,24,0,0,0,10,0,0,0,19,0,0,0,0,19,72,65,83,95,68,73,70,70,85,83,69,95,84,69,88,84,85,82,69,1,0,0,0,0,255,255,255,255,0,0,0,19,0,0,0,0,17,72,65,83,95,65,76,80,72,65,95,84,69,88,84,85,82,69,1,0,0,0,0,255,255,255,255,0,0,0,19,0,0,0,0,10,65,76,80,72,65,95,84,69,83,84,1,0,0,0,0,255,255,255,255,0,0,0,20,0,0,0,0,13,66,97,115,105,99,83,101,116,116,105,110,103,115,1,0,0,0,1,0,0,0,2,0,0,0,14,65,108,112,104,97,84,104,114,101,115,104,111,108,100,1,0,0,0,1,0,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,7,0,0,0,4,0,0,0,1,0,0,0,0,20,0,0,0,0,12,73,110,115,116,97,110,99,101,68,97,116,97,1,0,0,0,1,0,0,0,2,0,0,0,11,119,111,114,108,100,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,14,105,110,118,87,111,114,108,100,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,20,0,0,0,0,10,86,105,101,119,101,114,68,97,116,97,1,0,0,0,1,0,0,0,9,0,0,0,16,112,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,19,105,110,118,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,10,118,105,101,119,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,13,105,110,118,86,105,101,119,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,14,118,105,101,119,80,114,111,106,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,17,105,110,118,86,105,101,119,80,114,111,106,77,97,116,114,105,120,3,0,0,0,4,0,0,0,4,0,0,0,1,0,0,0,0,16,114,101,110,100,101,114,84,97,114,103,101,116,83,105,122,101,7,0,0,0,2,0,0,0,1,0,0,0,0,19,105,110,118,82,101,110,100,101,114,84,97,114,103,101,116,83,105,122,101,7,0,0,0,2,0,0,0,1,0,0,0,0,11,101,121,101,80,111,115,105,116,105,111,110,7,0,0,0,3,0,0,0,1,0,0,0,0,17,0,0,0,0,6,0,0,0,10,118,105,101,119,101,114,68,97,116,97,6,0,0,0,10,86,105,101,119,101,114,68,97,116,97,1,0,0,0,5,0,0,0,12,105,110,115,116,97,110,99,101,68,97,116,97,6,0,0,0,12,73,110,115,116,97,110,99,101,68,97,116,97,1,0,0,0,4,0,0,0,8,115,101,116,116,105,110,103,115,6,0,0,0,13,66,97,115,105,99,83,101,116,116,105,110,103,115,1,0,0,0,3,0,0,0,16,77,97,116,101,114,105,97,108,65,108,112,104,97,77,97,112,4,0,0,0,2,0,0,0,1,1,0,0,0,0,0,0,0,18,77,97,116,101,114,105,97,108,68,105,102,102,117,115,101,77,97,112,4,0,0,0,2,0,0,0,1,1,0,0,0,1,0,0,0,14,84,101,120,116,117,114,101,79,118,101,114,108,97,121,4,0,0,0,2,0,0,0,1,1,0,0,0,2,0,0,0,20,0,0,0,0,9,73,110,112,117,116,68,97,116,97,0,0,0,0,2,0,0,0,10,118,101,114,116,78,111,114,109,97,108,7,0,0,0,3,0,0,0,1,2,0,0,0,0,0,0,0,6,118,101,114,116,85,86,7,0,0,0,2,0,0,0,1,2,0,0,0,1,0,0,0,20,0,0,0,0,10,79,117,116,112,117,116,68,97,116,97,0,0,0,0,1,0,0,0,13,82,101,110,100,101,114,84,97,114,103,101,116,48,7,0,0,0,4,0,0,0,1,2,0,0,0,0,0,0,0,18,0,0,0,4,109,97,105,110,2,0,0,0,10,79,117,116,112,117,116,68,97,116,97,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,5,105,110,112,117,116,2,0,0,0,9,73,110,112,117,116,68,97,116,97,0,0,0,8,0,0,0,21,0,0,0,0,6,111,117,116,112,117,116,2,0,0,0,10,79,117,116,112,117,116,68,97,116,97,255,255,255,255,0,0,0,21,0,0,0,0,8,108,105,103,104,116,68,105,114,0,0,0,0,8,0,0,0,5,0,0,0,0,191,52,253,244,63,52,253,244,0,0,0,21,0,0,0,0,11,108,105,103,104,116,70,97,99,116,111,114,0,0,0,0,10,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,9,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,10,118,101,114,116,78,111,114,109,97,108,0,0,0,9,0,0,0,8,108,105,103,104,116,68,105,114,0,0,0,21,0,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,0,3,0,0,0,2,0,0,0,9,0,0,0,11,108,105,103,104,116,70,97,99,116,111,114,0,0,0,11,0,0,0,19,72,65,83,95,68,73,70,70,85,83,69,95,84,69,88,84,85,82,69,0,0,0,3,0,0,0,2,0,0,0,10,0,0,0,2,0,0,0,2,0,0,0,9,0,0,0,18,77,97,116,101,114,105,97,108,68,105,102,102,117,115,101,77,97,112,0,0,0,0,0,0,0,9,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,6,118,101,114,116,85,86,0,0,0,0,0,0,0,9,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,0,0,0,0,0,0,0,9,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,12,68,105,102,102,117,115,101,67,111,108,111,114,0,0,0,21,0,0,0,0,4,118,97,114,48,0,0,0,0,11,0,0,0,17,72,65,83,95,65,76,80,72,65,95,84,69,88,84,85,82,69,0,0,0,6,7,0,0,0,4,0,0,0,1,0,0,0,12,0,0,0,1,0,0,0,9,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,0,0,0,0,12,0,0,0,1,0,0,0,9,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,1,0,0,0,12,0,0,0,1,0,0,0,9,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,2,0,0,0,3,0,0,0,2,0,0,0,12,0,0,0,1,0,0,0,10,0,0,0,2,0,0,0,2,0,0,0,9,0,0,0,16,77,97,116,101,114,105,97,108,65,108,112,104,97,77,97,112,0,0,0,0,0,0,0,9,0,0,0,5,105,110,112,117,116,0,0,0,1,0,0,0,6,118,101,114,116,85,86,0,0,0,0,0,0,0,12,0,0,0,1,0,0,0,9,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,3,0,0,0,9,0,0,0,12,116,101,120,116,117,114,101,67,111,108,111,114,0,0,0,15,0,0,0,1,0,0,0,3,0,0,0,4,0,0,0,11,0,0,0,10,65,76,80,72,65,95,84,69,83,84,0,0,0,3,0,0,0,8,0,0,0,12,0,0,0,1,0,0,0,9,0,0,0,4,118,97,114,48,0,0,0,3,0,0,0,0,0,0,0,9,0,0,0,8,115,101,116,116,105,110,103,115,0,0,0,1,0,0,0,14,65,108,112,104,97,84,104,114,101,115,104,111,108,100,0,0,0,8,0,0,0,0,0,0,0,0,8,0,0,0,0,1,0,0,0,22,255,255,255,255,0,0,0,23,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,6,111,117,116,112,117,116,0,0,0,1,0,0,0,13,82,101,110,100,101,114,84,97,114,103,101,116,48,0,0,0,9,0,0,0,4,118,97,114,48,0,0,0,26,0,0,0,9,0,0,0,6,111,117,116,112,117,116, \ No newline at end of file diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.vert.shader b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.vert.shader index d5e37d6b6fd14bf334d68207a6ff6d4c7a1aa5f4..35b8ab1988bb032494dd8f62074a77c40712b488 100644 GIT binary patch delta 273 zcmcc0b(KrRFW4i9fq{V$h$VoS9f(CHiUcr;FibXN5}8=#$|$n&fCVF?;N+i-#f&18 zbD2_rAP3XDKo(1&dEG3!KyoLGI*@$GqUOf}GKK|e0+0f`AH`T8 fCm