From cedfee113d45cdf36b95bf651d415e4aeb8e75ee Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Thu, 24 Jan 2013 22:22:04 -0800
Subject: [PATCH] Fixed geometryc arguments.

---
 examples/06-bump/vs_bump.sc               |   2 +-
 examples/runtime/shaders/dx11/vs_bump.bin | Bin 2724 -> 2724 bytes
 examples/runtime/shaders/dx9/vs_bump.bin  | Bin 1083 -> 1083 bytes
 examples/runtime/shaders/gles/vs_bump.bin | Bin 1730 -> 1773 bytes
 examples/runtime/shaders/glsl/vs_bump.bin | Bin 1691 -> 1734 bytes
 tools/bin/geometryc.exe                   | Bin 175104 -> 175104 bytes
 tools/geometryc/geometryc.cpp             |   4 ++--
 7 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/06-bump/vs_bump.sc b/examples/06-bump/vs_bump.sc
index b2d631f29..f65eff9a8 100644
--- a/examples/06-bump/vs_bump.sc
+++ b/examples/06-bump/vs_bump.sc
@@ -27,7 +27,7 @@ void main()
 
 	vec3 viewNormal = normalize(mul(u_view, vec4(wnormal, 0.0) ).xyz);
 	vec3 viewTangent = normalize(mul(u_view, vec4(wtangent, 0.0) ).xyz);
-	vec3 viewBitangent = cross(viewNormal, viewTangent) * a_tangent.w;
+	vec3 viewBitangent = cross(viewNormal, viewTangent) * tangent.w;
 	mat3 tbn = mat3(viewTangent, viewBitangent, viewNormal);
 
 	v_wpos = wpos;
diff --git a/examples/runtime/shaders/dx11/vs_bump.bin b/examples/runtime/shaders/dx11/vs_bump.bin
index c11d3d7a0ce3922b07e39267760f25b3ba8090c5..6ec9350b27305437c224af509653abff3250372c 100644
GIT binary patch
delta 171
zcmZ1?x<qt>y}<mQsULzYzj%KQF8W&E<W{%Q{|g(}Ck6oqCI$uuH@V5a?2@7mOb$Q}
zL&JV#Jh_@(L8=I-kQpe&2GbxUz`z3JyD?4P%C5}91eBe8hh1F`rp~QN0VoRra6L?u
Z6*<%)YJE87^M2!pS`N~^`3J`uMgW||BU1nX

delta 153
zcmZ1?x<qt>y+Co1I8(7hgp8w4`X<p0w)Z#se_`V)Vh~_pVqjo!6PoPHE;*TtO?GlK
zyM)vxs4yE$T0($<1*D8)@>X_b7G|KP$#>Y*<zVXEIuwAi5CGT1F<FsA9irBUV?M7N
UlK=xVP{}uWpzh5-IMy%%0B9H+SO5S3

diff --git a/examples/runtime/shaders/dx9/vs_bump.bin b/examples/runtime/shaders/dx9/vs_bump.bin
index c5007f67407c5d229d895b92601b0cf927808c42..9b24bdf33730ccada1135c333ed7574267c6277f 100644
GIT binary patch
delta 216
zcmdnZv72K<2NNUz<W45VXeI{s1_lO(1{Q`V6POsD0BHsw0*S3^V1tUWGB7Yh)P**%
zGCWxTQUl@x^(+ACMb-z@0~A{Y5}VA*>>ACCWIi(%^Fd-D^C9XG=7ab!^O5zz%m<21
TUdrsw_8;idCk>N7F?#|4s>?GM

delta 180
zcmdnZv72K<2NNUv<W43<UIqs41_lO(1{Q`T6PPBSXB0PQWnf@tVqgb~hBmM=JXyfP
zzyL(tAQcNhDw!CT0NEfh_69bfJOjfjpxQ5!S(#l?Ok;+d#*D`_W*nw1Wp-zK0<`P@
Jgvp<nJpoe&D2)IB

diff --git a/examples/runtime/shaders/gles/vs_bump.bin b/examples/runtime/shaders/gles/vs_bump.bin
index b1f67c2928fcd8936472d4c9cac8d8523923e6c1..176e23f1d3a5e0aa3e54f56fd91efe5bdd2ee49a 100644
GIT binary patch
delta 502
zcmX@a`<8dZWai1MnPn!QX11^`$t@^LEQ&YNtEjB9=2B27OHDRWfC^fG1Ym5vas^uj
z13d#|vB`Zbl9NSQ#CR={L@g(uVUe@8&;*&NiEgAJvVKDYEQT5yfJ|jG2kW2wkwt0p
zc^2t<Ljx4^jA70)G(xi3&<N;64Gj&blP&cst11+<;7Sekswyfq6?7F43V;GA3V<3k
zH4!3adgWjr<WA0H<q<GOw#qo#VDds%Np0h3!&soLP%BZLV;pUSBxgDKB&(XT39=z3
z*!*uYS%^*Fzy$1Hgi{QSAz>MxmtT~dn1iqq9Q0-JlY7`CMUyg167$ki^GXoXhDMX;
Hvnc}rx$v5O

delta 427
zcmaFMdx&?#WM(zJas^uj13d$4E(L{>+=8;iqIfgCipnaWsD?&jd`V(ndTL(D<P>J5
z$@`f#CTp{3@LC|LwV0g1BFAVxxt>ML!xBl{5{tQ(FmrSBQ&Mx{4HdNDHfn;TK-$Yv
zlZ_|$vWSC>Ww!(iYfiqwq7<p2p#gQCg<fS<1wyZ(fnHTbrKW<e0zv^$07U^%gQg}>
z1nwWba!rtJxrrsllh3n?$s0u*!~%T`wZRZMGz^WR4JU74mE<>yHbPQkG5HItnzAvH
ymko`v_}S2SvMrmwkTKXNNNzHkT*oFZ1rEtFSRf-iVDfr4smbfu*e73LlLY|z9D?rv

diff --git a/examples/runtime/shaders/glsl/vs_bump.bin b/examples/runtime/shaders/glsl/vs_bump.bin
index 47024201d74e77814bef9a6007646f2a9dcbec0d..92ce52295f099465572b620d0d23ed54781c0c74 100644
GIT binary patch
delta 467
zcmbQudyIEO4zrAct%8O|Vth$rUV3U?iGr4bk)DC3g06xgkea-N*@B}ax1cPsDBf)H
z0%j3j3u`U~1*nL{<b%w@j24rxGVAkNB8gj07G#kFiW{(qP0nQHV>AG%lQA^VtEj93
z*_NB1lA0552($`nkon|Bpwincf|Es9r0We0G(jpgK_-@^CL6<485$wkVQ2()w+7S%
zOTEgf3WR}%hI&;Ml^|ar6aWQK6aY17Y9d6;^vc0D<}xRi7*F2MD()6-5DT;eYJs64
zvgO9nhRAX#4l|B6LXxwbyogne&jeYs2`D(23{57#X4Q8#0s9r<3`1jxzvJ`ri*gfl
Z5Dowba2Y(BkQ_ESmQ9M$XmSOcG63>xjbQ))

delta 425
zcmX@cJDYby4)bJ2HepsXy^6}J$vMn2lf9WmCeL8jn9RbW!E0g7rJzufTTqr*6mK#4
z0*joAxh6=VCP=(2HQ59vX^EuJ5@aBw<>bH2lB#B4<xtheFx7?zNXiWjKn4TVe_#>M
zG(?s#RIpXh(9nR{uUA=Bp`e8@L$9i$Qd2=!0iggWfT94XK~obbk{Dl-n3tZKSE5%A
zc6n}M$>hH*5^m83u|O-J=A$~wDB2KN4#izY(MCve7L(7is!gtB<pX+Kgwc4i7@NM9
tG1%KkZZU#{SbSc7QEp-m!cvRL`D_w0;NU2WPs)Tk6CrPCIC(LfG5|g~f^`4@

diff --git a/tools/bin/geometryc.exe b/tools/bin/geometryc.exe
index dae599c542f2b16cc6f68a482ea4f028180bdde1..91a7604bfedce83622b17f142b64e47dbb8ddb76 100644
GIT binary patch
delta 235
zcmZp;!PRhsYr+E-BYvj9iBEi(s<&=7V&tu6OquLZBNnER#Q=oNK*;!F)#CsE8}=%F
z|Noz%#1ta_S}uzb2pO_ifbv~P@}h8Yrrur^pq3XoKv^hr<K%TUQjC_9Pu3_fN=$xL
z6UI1ivSY0c<E+VbwX)o-)(i~IM>v26CQn{gYb_AU#=y|IRRU;6?-CUTpxpb~?eA+D
zr)GkkyuIT&V@ZiXnptXA*4YED3qP@cVrOgEznv$Bslkxl(=yGnz;ep=$-PXuasVNt
BVJQFr

delta 235
zcmZp;!PRhsYr+GT4@{o}CO+|DntN}v5hHIkW7=eg8nFnaECwKC213Rcs}}$N->_Hd
z`~Uw8CFU^k*9uvTK**5A0#wm~q(T%f&eYqh0@U;(3n&X^uAjW7MvBpV^6?r4MzP5+
zYQh-jOt!DJVVp6!rdF1l*_wf&`3MKlz{JT*YOVQ#*%%l)w@Lubc+K4F+5EnC`}<nP
zshMCWZ|``{SW+Tzaal=srtM>gsa&6D<fv?B*v=Ef)L_W&ZJA+NWI1j7<X)y+IRGG6
BWv>7L

diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp
index d46590a31..63ace48fb 100644
--- a/tools/geometryc/geometryc.cpp
+++ b/tools/geometryc/geometryc.cpp
@@ -377,7 +377,7 @@ int main(int _argc, const char* _argv[])
 	cmdLine.hasArg(packNormal, '\0', "packnormal");
 
 	uint32_t packUv = 0;
-	cmdLine.hasArg(packNormal, '\0', "packuv");
+	cmdLine.hasArg(packUv, '\0', "packuv");
 	
 	bool ccw = cmdLine.hasArg("ccw");
 	bool flipV = cmdLine.hasArg("flipv");
@@ -710,7 +710,7 @@ int main(int _argc, const char* _argv[])
 			decl.add(bgfx::Attrib::Normal, 3, bgfx::AttribType::Float);
 			if (hasTangent)
 			{
-				decl.add(bgfx::Attrib::Tangent, 3, bgfx::AttribType::Float);
+				decl.add(bgfx::Attrib::Tangent, 4, bgfx::AttribType::Float);
 			}
 			break;