From 10afc74051ca1e017489780c463db08887892f07 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Wed, 2 Mar 2016 21:13:23 +0100 Subject: [PATCH] Update spherical environment mapping shaders to reflect camera orientation for normals --- data/shaders/sphericalenvmapping/sem.vert | 4 +--- data/shaders/sphericalenvmapping/sem.vert.spv | Bin 2856 -> 3272 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/data/shaders/sphericalenvmapping/sem.vert b/data/shaders/sphericalenvmapping/sem.vert index e5649f91..f7d30199 100644 --- a/data/shaders/sphericalenvmapping/sem.vert +++ b/data/shaders/sphericalenvmapping/sem.vert @@ -27,10 +27,8 @@ void main() mat4 modelView = ubo.view * ubo.model; outEyePos = normalize( vec3( modelView * inPos ) ); outTexIndex = ubo.texIndex; -// outNormal = normalize( mat3(ubo.normal) * inNormal ); - outNormal = normalize(inNormal); + outNormal = normalize( mat3(ubo.normal) * 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; } diff --git a/data/shaders/sphericalenvmapping/sem.vert.spv b/data/shaders/sphericalenvmapping/sem.vert.spv index 8c58087658eb1335406ea96a6669d70bf913227a..1a74a7de7e08254591f533f9083bd254f138285e 100644 GIT binary patch literal 3272 zcmZ9N+jbOH5QZBj2`J&D5>OE*;5ix*0Z{~!01jw?a1@WjkhG!6WF~7eQS=Hgd;onS zmrv!5Yx#YX&+2QZ@Jy=^p-a|%X$0wv7>99#g%N7 zO!XQ@VXULSF+AVz_6LZ`$GVDMN$Il(eYL-ockdMWFUhBoy}*8Z?i$^XB^fna8}zNF z=+ogCar#hx8Ot7=ef9c-)lT;b=d^w<({JXq)?xnWa&IYrgh<9l_7eNX{XX(&njN)Y z{54RfKDQ!`an2d;YE?qY<=l(jCI#2XT5t|Ud7j<7FiLeD_T_GS zAs^hy2NZ~!YL<6t>#rAS5M$Z4^r?;4I+MJ8F zjc#|-WNz25og`?ICbM@K;)8p zHqM^vaq7lB1`#LsY@9XM)}@o{1|s?Q(TLbI93W_$kZTpS74z zzZdy+pM=v#c>-ySy$SXc;f&O^H_^9Ovi#{v_x%t1^T^f{cJ-*ye165uXDtW#btZD^ z=HJb3to%Ooy@@Y#9>U_8Xse_28KIxD2Yswf-E*_AsVdh#ALDtuLw5$6~mW%xFAxE!M$krDA&UPBq{XeXHoYgU8XA^ek_%X<` z$LGwiemv>r^PT-1upjIDg57wb{#7L#7x7n+Su@W5Dne6@rCt46(w^uy(aj(ByU6x* z5dVAZ=GNyBQinax{~ofij{EHPq}{oxFIJp+ozD_*>A%9RzqwBGe)v3R>XQE##`oV` z-Y5U}*t5DbXw`IQ;CEU38SL)kUO2}OKWx4?io#2dgQr;?m35k8CjokvYPixV2&2hSG#%CwRzUQTMIzW?}oWN+v`By zT%k)3)y(TArXHYSw70gD^mrwNgufl(%~rKvIu}A{{~T;4XJnmT ztH04*U5AEJD1=McjWMrdyE!k1*6>(*V7i6pv$p=W-QVoI>-2k}94cg2(nCpW*v)@G z^4lJLOFt(k95DkD&}2Xq*oE(t$A+uLeJ9PNz)T@##@tvDER$)Cz7)SE*&KnLgdCuF z4gVsRU32JP9rH5wG`{v4;Au?aUx(E6c+Bh1<=#Jk5nuh7zYXV@*0!$1w-(g|7e~>tA85S8JAAOvA8OIW_6NzAtxH#(nFf zACx}(N@CJzeH{r40oc)84m2&Z0 zI1aEVin_U?zQ`zg7jAsOU=P&<#@sLtx(APg%x@3cuD_4(ENi^!at3(-Y&Z%m_%IfK z2)Eh1*XDnjF%LL}eFF9aKL8K78~YR(kNz|G9`K1C^Ur}b#;s}krMv(&utkynOJJdK Vhxt{#27Y-C^Dz3>{pRR(@CR>8PO|_2