From 062ee8c1c5e9029bbbf6ac78eaf8f9b8a85f3ab3 Mon Sep 17 00:00:00 2001
From: Asuro <asuro@posteo.de>
Date: Sun, 7 Mar 2021 16:32:41 +0100
Subject: [PATCH] Use correct normal for tangent calculations

---
 shaders/triangle.frag.spv | Bin 3536 -> 3448 bytes
 shaders/triangle.vert     |  10 ++++++----
 shaders/triangle.vert.spv | Bin 4436 -> 4436 bytes
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/shaders/triangle.frag.spv b/shaders/triangle.frag.spv
index b312f522c8da2a8f12ee7c2f27c83adf479ea1a7..cc27aae61290c3a2d1a1cfc31f7c629aa4ee3376 100644
GIT binary patch
literal 3448
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

literal 3536
zcmZQ(Qf6mhU}WH8;9#g=fB-=TCI&_Z1_o{hHZbk(6YQf`T#}+^Vrl?V!N<T1qQG+e
z3|tH>3=CkLo0ypgk`QEIV31>AV9;Y=V8~!#U?^u`U=Uzn2CHFbU|?WoU}j)qU|=}J
z2-3&N;O-Oe7~~XRoLZ1rlvt7)U!0Mcl3Em>pOlrFTvE)yz{<b^)(bPAm4S_clYxOD
zFTW@^F(*DbF*m*xWG^cND+4b=yd<>(q?eTe<erk$iumOG{Gt@FdCXw<l_cdcurhEk
zC^IlH<YcC2l*FfG7NsVaWaj6=4P|9uXHaEeVDJY!CNwWIEx#z&C9x!tfq{XIffXzV
zvb!uZ7356@HU>7Z7%2P-it<4|$jr|}s0I1EBr`V^q=yY^HYhY9_7~(AXM(H;spkTl
z0}5M+9NcY*Iq^mLC5bR~5cjb%Ffb%1=B5@U#={L^WngAdXJB9`P0D8gg&8P5V3P6W
zIVm7Ffc$67z`&50o0OTFR}x=bQk0sPUIL0X22gmK!owyxKPSHkY>qjSdWa|}oY@(y
z85kH+GSkvZi&N3eVPkMal0)cWV{m0)U??s~O)kwzEQ&8n%qdL;nZ?H7#=yV;3R6Us
zfW+AuLKzqsic-^ZQj?Klivc1Rg=`j*M?iiD#TVQjr~^R$19>#Rv?LxX1om?gl3PKE
z2&4`axzO|m4mo!Q7I0cq0tF%i0|Sh&$iM(j+aNwD-GTA}NC}7!VuLU!zC9RN!0`)`
z1I3*OQd$C~N02zO7%1NeFfcH{^nubBvOW+Wq|X7Y29hp8VhDW@F;MygscS$|2XYTc
zYyy%PDBXd?79fd%>;s8y0Q;92?0%4WAisgq8FE;F_@J-=`2!>mN_!x`!_<Sq9mI#p
zgTfqHKZp;~5Ap*@KPdb`>Op*A1}1PAD}qZBNO+4eFf*_*Ffb@EFffQSurPr94dR3R
zroh0$z`?)(76XY(GH^0*f%7k@<O8_?fkEbjc+w2a4BQM1V09q<JRm`EnaIFk&A`F{
z;)BW>kTA$TeyDjM|AEwl;tFIINF1ad#0RAZkQhk4FjPG#oV6KPz-|`@8OFfi0OL!7
z`3?3G3@i*XQ1`?9Bg+7BJ4hU4K8OzsACP(#1_lO@9U$}N7&yRj1rh^cP`H4?0fs^D
zRfDEmP+12u55xz>A;>?X3@i*9(69x$ALKp|UlUxGgTkDJK?|xMWG2WwU8ws&e2{q{
zJ}3=<^n>J$p#A~51!NwGHeq03ID6)dtqudIWMp74V_;wag#ir1)Y*W;g@FOY2f4!?
z$_JV20d)t+pE?Ze;4tuEU|<00fnkt&AiW?v<H33xoIrZhq5c7d8_3NdJ}8}n!W_g0
z#W^Tlg0z76AU}c9CCE=^46NWZ2?}qJJV?(E1||kjo&l)^r9V)e1q%-lAC#A1d{B6R
z%3&BEBo8Wkk@=u<7sdyv2bH%lK1e;NjD_(*@}RO6#s|rR%2Z@Ns4Ru?LFz%}CyWnL
z4=OW3d|L(<a9-eJU;vkSAU-Hv3o$T&>(+1vR&Y3rFfcHH)PThO892cCO_YIw0VEE>
zpl|_&6(~*FF))McaF9I6JdizN3=CkgJ_b;&#K0iIz`y_!1LcbVXqu2hOB2mdwbBd_
z^&oke*&s2H*`Pck4{eix_#nGL<pd}`CPMXt${LUwkT?(2E>L*{axW+xLGmzjLE?@K
ztl%`S&A<SzV?lWVX0{FkC~Yz@!1(&mwh+v%phgr(4M-ejmmxI2fb0UvgX{vO50E&B
z4N4oJ`~hNv(gi4QfXoM_VG9NZ29P|65AvHO0|Ns{4J;h37#J8pVjy)O{h)LN5`(F?
zg@!wfZ^ys@ZWB!b*Y*qy_6#7uFff3`c^KHiWfiEN0fh}H|AF!qNDatrP?`kEfy@HA
z&4~e2UV`*P%4BCWx4AGdFo48B>OlHIX&591VuQj0lvhDv4a(P^(69#OcaZs@JnqH7
zzyJ~lg(HaX4Gl+79D(FO@e9h&z6=ZuAURN35D4{`9|HpeNF0<dVPgJJF_7P2VgXPw
zP`ZVs!$1ZG29SP`dXPNGJ)p1;LW}EQ1_lO@T97!%jUY84P&b172a*T*6_htY;xKc<
zpm9(St;@n07#KieF!=~*oPpv4WM(APOi<W>)Pm$e=7RD#NDihint=h_hJx{97#P59
zEm&N~GB7ZJ)PTf6W`p7|4r(?iu0isk_=d?PK;=OB4x|oLo`UQJl_elKkUbzXk{B4k
zZ9N!2nSp@;q^1=b7of%{NDW9Fqz2?CP$L;R9j7rcFo48BYC(2@$|sN*OnoK;0|O{+
z!}wVY4B&QWBQ%d^GcYiK)PTfcYH~nrSq26Mn3`M$1_qEikT@*<L7f_qIC474XJB9e
zi6N(x0;m`yoj~fILQsE%fq?;}9wZM+&mg-&ZHr=1TNa$RSQtR%X$e|+3hLB=)PTf6
f;RH&@Wef}qATvR7pfCW{Pav_s42%pG42%o_W<e(7

diff --git a/shaders/triangle.vert b/shaders/triangle.vert
index ee77869..afd9fb8 100644
--- a/shaders/triangle.vert
+++ b/shaders/triangle.vert
@@ -31,21 +31,23 @@ out gl_PerVertex {
 };
 
 void main() {
-    // Vertex position
+    // Vertex position in camera
     gl_Position = ubo.projection * ubo.view * push.model * vec4(position, 1.0);
+
+    // Vertex position in world
     position_wld = vec3(push.model * vec4(position, 1.0));
 
     // Just interpolate UV coords, no transformation needed
     tex_coords = uv;
 
-    // This should probably be in object space? idk
+    // Normal _direction_ in world (not use atm)
     normal_wld = vec3(mat3(transpose(inverse(push.model))) * normal);
 
     // Tangent->object space matrix
     vec3 tangent3 = vec3(tangent.xy, 1.0);
-    vec3 bitangent = -cross(tangent3, normal_wld);
+    vec3 bitangent = -cross(tangent3, normal);
     vec3 t = normalize(vec3(push.model * vec4(tangent3, 0.0)));
     vec3 b = normalize(vec3(push.model * vec4(bitangent, 0.0)));
-    vec3 n = normalize(vec3(push.model * vec4(normal_wld, 0.0)));
+    vec3 n = normalize(vec3(push.model * vec4(normal, 0.0)));
     tbn = mat3(t, b, n);
 }
\ No newline at end of file
diff --git a/shaders/triangle.vert.spv b/shaders/triangle.vert.spv
index 7b505f058f0160e72e9fd1e04c4e7e0543fbb0f2..ef450b983cf500a8f8d4a0a4a3112aacf63755db 100644
GIT binary patch
delta 21
ccmcbjbVX@H1rMXo=1QK~OpHF8MfvTS09Wt^r~m)}

delta 21
ccmcbjbVX@H1rMYB=1QK~OpNxMMfvTS09N@1jsO4v