From 9cf52c4b45ff46302cd3e6a844cdf66c29ad934e Mon Sep 17 00:00:00 2001 From: saschawillems Date: Wed, 2 Mar 2016 20:57:33 +0100 Subject: [PATCH] Moved shaders for spherical environment mapping example to separate folder --- data/shaders/sem.frag.spv | Bin 1752 -> 0 bytes data/shaders/sem.vert.spv | Bin 2732 -> 0 bytes .../generate-spirv.bat} | 0 data/shaders/{ => sphericalenvmapping}/sem.frag | 5 +++-- data/shaders/sphericalenvmapping/sem.frag.spv | Bin 0 -> 1948 bytes data/shaders/{ => sphericalenvmapping}/sem.vert | 6 ++++-- data/shaders/sphericalenvmapping/sem.vert.spv | Bin 0 -> 2856 bytes 7 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 data/shaders/sem.frag.spv delete mode 100644 data/shaders/sem.vert.spv rename data/shaders/{spirv-sem.bat => sphericalenvmapping/generate-spirv.bat} (100%) rename data/shaders/{ => sphericalenvmapping}/sem.frag (68%) create mode 100644 data/shaders/sphericalenvmapping/sem.frag.spv rename data/shaders/{ => sphericalenvmapping}/sem.vert (85%) create mode 100644 data/shaders/sphericalenvmapping/sem.vert.spv diff --git a/data/shaders/sem.frag.spv b/data/shaders/sem.frag.spv deleted file mode 100644 index 8a5795a29e21d43a807c6201d5264cc77971491b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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% diff --git a/data/shaders/sem.vert.spv b/data/shaders/sem.vert.spv deleted file mode 100644 index 82c3df79037fcd85ce73feae6c9b6f127e9bdbc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2732 zcmZ9M+jdh`6owZ~6Hp4Mm4k|yQqM@OSP(^^2QXDD6bkh+BeZ+et!Z{gk}7(I7e0VK zk;A9*#xeZ9ojprncg(K&|MRfsnrp7qCT0((bcnwr>H9SLUQQF>lw6zDI>UN2HA=p< zwy`!h7;eukT%Lzc$5YLvw4F%DN_~?5yPdozcmX+zyoofC_mK~fZ;(x-#@__%KWsXQ zcWbS^bbq-$$o4w@&M<2ae&}px{dV!_$82jjc-99~-rH$+JH4I#&Q8`|xHP}l+4?Ef z$uwR=9mYC}{ozW{E&8aXk9Fm}5v9*d;N4<7>u%=RFQre7KBV+;`7Wn#lsYi&^$V-X z3r^S|P9Mr2#j*zHxq3x^x6^&f*{z>P>4~hRY4HA|0=-`Lh#GJInynWc6=t&RS>6j= zFZ+kjohoe^XFv1a0R>k}7vVgp`X$!gQg5VH)}3y9J?n2~{bBYPSe{MZPg^m_%fmI& z;nLr;m3-bCZsfmZ`i0FiVq59vd$;nzu+!Vh4s4!P+kUruV6z_Y-p?~T19|U3_IRZz z`r9eB$|*?cTQGhOU2{%XpY8N*vF8sY${l%W!do`c+ ze#Gjz6!9mOZZF*5^;3jz(fSuqnj${!;>#s^ia!UNKkPTqJyYacLQm<*&9lU}(A>iq z`|3=@U1(FR>uXlepxtwb{cVsluYLU%@zei4t2T3azYkd5$2zn>WIcq)n@{Wv%3WdB z_4Dri%=0gdZ&P1q!QX#-Cbowc$FM#0cU1dz?5#Kj5&)KC+|MiC>Q>|FFCP&nL(P!pTvvLBl^hSgR@_=h`e8L zZ==iEtKiyt%|z5p&spZN8C+{{r23 zXFB4qq02}7m*^3%&G_G|o?k~dzdn)kCb~I&OObOCT|VNL(dCwq*k=Vj_R&7R&n>Wf z>0_Tgmv^GSza!fJsA~EO-B|7R%=wnHK4*9hnMQnr*5^EahsX!MgYNvryxv9EM_!*} gtm{YH35QWEFkV^y+0TC|?C|*!R1VjrbZY9PF(>rvHrpmygC-^2m_E}L@8!y?%51x{H@mPn zhey9j$By_6m|m074w`-=#Ly?467C8Qg`#j;XYlD3()y*e|4@L8=`rO>t?;r~YX=8@ z%kKoW_B($sXw{;(?}Ob=`(GcK8ezS*?}zn6zaG>U=I0Ll-47VdL)6Ydoqb~amny%g<7 zq!6Dmi`tuhr{o`?XXCp!!q>skR=5`&B|f}GBTSB!b%wew3A`mbHKFr9=;T6Yp_5}W z*8b`f(v$P)IA_20V2~7i&lv$T1-+cH|LBUD`ciRQ?)_SjX;3r+07wy;nPV z(O0a_ec+tVeb9$xAJpy%tQo7HNmTI}GbGvNboLQ(oOk+|WNJmH)(e6$pVyu4#k$E; z{}svj;7|Ok+KCVE{BKFtTF3v61pJvJ{26xc4$pni=?C1Hrb}ZI`%@q5|9xDZ_r&8z zyak-J;E0D#KUuubvUX1(4*n0U439rLJ;mAO@4($y+~KE~ ztaf72TfP_9OLV>kr_&q02dDFv(^g;AdH9?_|DDbp(*K;S*ark^FUK7JBgU+$67pgz zs2cK|72uc+VsW2g0p9tHO2&uza6acG!#khzlJQ|?oX@yq_%F&u+=~Jnb5s>WoqQwY zBOZ2Y(6-khBk@Wn=5^b(F-%;%E8Y@*|TU%&@Fna5-n zBio-xvaJX&?7dedbB5)(HOX+?$-VWuWPGs^_Z=o%YlhRJV znf=E?Q8+#~8A75?GN|Na>R0e d70Xd)RnfTHbAj{tV<#6q;J*diFIBTF{02Zsa_j&A literal 0 HcmV?d00001 diff --git a/data/shaders/sem.vert b/data/shaders/sphericalenvmapping/sem.vert similarity index 85% rename from data/shaders/sem.vert rename to data/shaders/sphericalenvmapping/sem.vert index 2c60823b..e5649f91 100644 --- a/data/shaders/sem.vert +++ b/data/shaders/sphericalenvmapping/sem.vert @@ -5,7 +5,6 @@ layout (location = 0) in vec4 inPos; layout (location = 1) in vec3 inNormal; -layout (location = 2) in vec2 inTexCoord; layout (location = 3) in vec3 inColor; layout (binding = 0) uniform UBO @@ -14,21 +13,24 @@ layout (binding = 0) uniform UBO mat4 model; mat4 normal; mat4 view; + int texIndex; } ubo; layout (location = 0) out vec3 outColor; layout (location = 1) out vec3 outEyePos; layout (location = 2) out vec3 outNormal; +layout (location = 3) out flat int outTexIndex; void main() { outColor = inColor; mat4 modelView = ubo.view * ubo.model; outEyePos = normalize( vec3( modelView * inPos ) ); + outTexIndex = ubo.texIndex; // outNormal = normalize( mat3(ubo.normal) * inNormal ); outNormal = normalize(inNormal); vec3 r = reflect( outEyePos, outNormal ); float m = 2.0 * sqrt( pow(r.x, 2.0) + pow(r.y, 2.0) + pow(r.z + 1.0, 2.0)); //vN = r.xy / m + .5; - gl_Position = ubo.projection * modelView * inPos ; + gl_Position = ubo.projection * modelView * inPos; } diff --git a/data/shaders/sphericalenvmapping/sem.vert.spv b/data/shaders/sphericalenvmapping/sem.vert.spv new file mode 100644 index 0000000000000000000000000000000000000000..8c58087658eb1335406ea96a6669d70bf913227a GIT binary patch literal 2856 zcmZ9N+jbOH5QdvfGN42dm4k|5LOi1}Vn7su9KZ=0Lm&{*n^{BBE4EH%vL+KnukgYL z&?j>FRNlCj-?zIf8R)EkcGX{pUAuO5r#3QmILi+4cO?5hE1whD2zr*eHmY@!^=MX4 zd~-kC=R{tLT=LJ};tg_crs+dXfK*q54eokv0hVvUUc^N#ytTMC--ceH4n$B8}~PeIJtwk@;uIpehyrdlY2(<+aG7{1IXp*D1`Z`PMv6picxvV#4!aMN^&b{PZgENPm=L=3*&huG| z`Sg34U)M=EeUwij)ma#zlj|EGG7y9*^?V*iT?&k&X@_L71p>< zZNj?luzCjVoe1849$*_>7Nc`|zcr-3u#T&p8Pi;7{V!&jWqr@50&VDIo6?+?&X9hlaSfD$c&G66u-W2FB~JeZ1n| zK{oal(8pSxae2?{Onv}7ud`~s-q(jfUVmp=U7LH&0OvIJ_!v3%&}Pgut9-=FBD-(s zmyq=tC!;wp19LQizS_;>U2C&e@A?ZM=Uki1zFh4=|4 zo&yoTfE@AKjQ_p5qeW!%>k~QctvP*{BIlRL@)5U$Ea&-RpWDc>kM`kxzCw2|eeAR6 z`Woo(cS!pmRZYvt#%i}`z7KNN=gi*&-mmYV^*O(5KtA;Q$j)ob_XA{o