From 09869322af47e1b005f6a6cdae19d454a62d4f2f Mon Sep 17 00:00:00 2001 From: Jaakko Konttinen Date: Mon, 22 Feb 2016 14:06:35 -0500 Subject: [PATCH] Fixed a mistake in sem.frag: pow(x,y) is undefined when x < 0 --- data/shaders/sem.frag | 11 ++++++----- data/shaders/sem.frag.spv | Bin 1796 -> 1752 bytes data/shaders/sem.vert.spv | Bin 2848 -> 2732 bytes 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/shaders/sem.frag b/data/shaders/sem.frag index 9d6d152c..cd473cab 100644 --- a/data/shaders/sem.frag +++ b/data/shaders/sem.frag @@ -11,10 +11,11 @@ layout (location = 2) in vec3 inNormal; layout (location = 0) out vec4 outFragColor; -void main() +void main() { - vec3 r = reflect( inEyePos, inNormal ); - float m = 2.0 * sqrt( pow(r.x, 2.0) + pow(r.y, 2.0) + pow(r.z + 1.0, 2.0)); - vec2 vN = r.xy / m + .5; + vec3 r = reflect( inEyePos, inNormal ); + vec3 r2 = vec3( r.x, r.y, r.z + 1.0 ); + float m = 2.0 * length( r2 ); + vec2 vN = r.xy / m + .5; outFragColor = vec4( texture( matCap, vN ).rgb * (clamp(inColor.r * 2, 0.0, 1.0)), 1.0 ); -} \ No newline at end of file +} diff --git a/data/shaders/sem.frag.spv b/data/shaders/sem.frag.spv index c939b87f9c02282d01e2b66ab0e534c388b54b3c..8a5795a29e21d43a807c6201d5264cc77971491b 100644 GIT binary patch literal 1752 zcmY+DOH)%p5QRrV5F~<#fQXL(iVqYK0a4^Fu%Q5T;WBlFRE&~@3c)IOy0FTXKgwU_ z#wx!rxl`h#PEDWFJw1J=JDIle^C6t$*BQ1#YxRXTcnIC0qq%SIyxo~PX&g??&P^N9 z6Ee*}V|qhZXlECdq+Hd}4K9Kw;03ruy#7v*;n&9gi^J`l-QFpzy;(1u6pxd7(kK>A zJ|u_5dZG6IWAUJI@_!7ja-7w@lkj@Z~hqHPZslxQmdWO z9>nTk&x0ZI(c~uApNHEEH6g#iZf^Nv%B@)~a%+|k;O}G41J`8AFSjUqd+5iGcSipp zn&%@Q#s`Ti%`-uMm$kaA z={HK2-CXv{d5*o2JFAiV*3N6>zRg6+mpHGU1NJlW9&G!W!>hj+SnGCE^FJQKGL?9* zzBQ`xo-07jUYpDB835`rW(eCD`yFGhVynlPYuLs(12JX+=Tcd@N;kDHyddq7RN%o%IH zkL~$=avS>qsEHq`Hi>NxeKGD4wsR}|ZqH5uWA#~=y;Soq=WQN1YjWeC0b|~A-uYet z#;ETxJ-*v>pe|h2?#$T_XY(a+UeES*Db?e9EyLCFAV*%`b`_Y*di6Wg_Uk8ky>|_G t_bPae=9zV%?uyz5wwk%3_A1q^bDwN}+a~b5@%p{XH}b!%?++Okz+X=(WrhF% literal 1796 zcmY+EOH)%p5QRqq2!aA4AmSr{;sZrQKoofkaX|s9A z$K;?;%~w8rD(u&5|K|`Ym5ceqq+C2niiP~_%=B@x|2edwbhdsQH9DzL1#SH7rBvSh zTG*?g*znm~sk~FE9wmnjUncZn9HsG0xX1ow$K3Yx8!9LDt!h%-s2o<5O=~`5KT7Hw z$#H}G-KBCPB}Yfry$QT0xi#f}zudc#yX5MPrR>Wrp0+Rz-tZpW7e zL+J6aDfhLqaPMEAkY8X|TfW%j_N*^*dzPEu%N{i+;nungSgQl@evGV)Wn6wGWvBcq zT)h~-f$euhy)1SJ-&X8@0?Qi4t$&x@`ub!36gDf(e}ZAYvta%VyWg(g?~!}w`i7a1 zS$6a7=j@7ngv>bt=BYQ|Owy;G+&6Q@`|^!EZ~ju#wnprC4cj%(1o>U|>awRlc-q+2 z@~xcV_%`0X^BK8!;f%_c$an7szF*{*uzkO7qQ-lGz2#D$f5#y#Q`tJk)~Ifs0ie&f zQ_KDbfqu2*LqM%-z?gFo&ktjJ-nWkD&C?&xk6_31#ytO>`f6VX>YEcaoqIK%m#BFQ zTYo$^imfjTVx2MUSjYI;I^%F_nbS>WYu^Uut7H5}v!^@Qo;B{B`4;-(UEjyHzg_NU zg8c!|CtPaAz9+FgzlXND4}m`Mv*~+;t%k9f_ZZuG7k;y6r-8Y~?8}+ZXD#P+0XU;_ z^PdBA-gDl+ixQ zP9T;AVhten0^$fDj@;NN%%sK2zzXK2=fsDl7L}w{c)9>Z*cc*#Du801dBr7(dC93j z(an>XZZXQbGq8ZwgG^-wVh|ss7Q|=UoXOJ6q^STD3I}o-fmj5Ht)YC7r64gFKXUU^ Hw&TnIr+^%=