From 37b45caea2436205472b0db639f970ae3ad249cf Mon Sep 17 00:00:00 2001
From: Evan Hemsley <evan@moonside.games>
Date: Fri, 31 Jul 2020 13:57:07 -0700
Subject: [PATCH] minor PBR effect tweak

---
 Effects/PBREffect.fx  |   2 +-
 Effects/PBREffect.fxb | Bin 8060 -> 7552 bytes
 Importer.cs           |   7 +++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Effects/PBREffect.fx b/Effects/PBREffect.fx
index ca57701..9d49a36 100644
--- a/Effects/PBREffect.fx
+++ b/Effects/PBREffect.fx
@@ -92,7 +92,7 @@ PixelShaderInput main_vs(VertexShaderInput input)
 #define NORMALS
 #define UV
 #define HAS_NORMALS
-#define USE_IBL
+// #define USE_IBL
 #define USE_TEX_LOD
 
 DECLARE_TEXTURE(baseColourTexture, 0);
diff --git a/Effects/PBREffect.fxb b/Effects/PBREffect.fxb
index 3a2f02cb8b8597c6a34ceba7917ec82d8724180d..c6d92be11767fad03ad71c8ec1136836565fdd26 100644
GIT binary patch
delta 1088
zcmY*YO=}cE5Url=b%*)fgq>YY0ve(ai8m1sqNsr!BnJft1uyy!^cQUB7)1>9ADDxu
z*~`j;=*g=GFM<az-sTSo3I=4ySJk~6Go*I<y{>v)uX^(Lmbozv<MI8Bh&pXMZ}(~U
z;hno1fPWCob@5`1=fY3?7(_rZDZGym6=I4AC=u?1=ROM;o#MU;m!7I^h%yvsC!~Fy
zUbVNAvv!(XR?qFtjqAP1WHN8(YPOwTR7C`p#lv0j6WM3k$DUDpkN0;k%{KEN+TI&v
z_R30VzYHR~x0=~x@Y22q*Ds!`+`cGAs&5aA9s9l523EuK_}v`7QHgyweDa8>F&#vR
zAt)NiT6;{iVtAi%fPI)Zit2-$>dIjaT)xVwtS~;*2gt8E?5EMSF|V<2&Y+O@c+GW+
z^dir29SLrQV;oQq>()fnh_2hOO&_<wS_|xIL(xTFqUCyM!O_?g8e*k{Ym%Gh##{lL
z;(f<a(81wd9ISDQCS}l_>;ro)0O#~@i03poHZBG$cg{G2XlXPZAqanb5E(eA@IG*y
z0>@%xc&c1T#2iWdk8^6hd$;fQPBa-S%23B<8q>x6JM6|?!?BFM3ykZOE93&kaEt4A
zj=g(~x~%xK;3hS40<3}2G=x#dSL8X#VT^yS%6%%XZp>mB5gKSYSsc4WC(Z(H3h`np
z$b0K26GO1B`1=DVc}nz-#SqaipT`Hc6*~sE%!8>_aRGs4VrsvxjndeACCH`r_u7_9
X?YZ@>B3;Tf+;%`=X!6;E^&R~WIfl<s

delta 1449
zcmY*XOKTHR6h3zzX7Xq<lSeV4)JM@`H{t_9QJWT|g@6bK1YcCCAk+uceJ0pN(S?P(
z>CRbnm7*whqq~AXz=EJ4LKpb~F5C#x@%!#f(sshlJ?A^$`R=**obckm%kRB>yXlLF
z9mm`8qD<XrOdf>$LnT-i8-09-H-UYHVM#$4-opBgMaPybw&Sv&0eoZFEg3SrQ?SXK
zFgy>~QMsM+=9Sz<at`20SxUhb?3U#BB(EB*Xs|7aQShU|N_(&kgZVp{ep@)BeRnv&
zw&s|^l_<TDAJL0W-CrX}QU37hhFjC`TrWGo_4oYgVBx{+{M^iBv+?-;qq!%~<(Y0A
zIG;iCb{tsi(}hu0%QHRwj1=s=?hJj(Xm#~wbLzx;qxj3w4}+p^R$kh^ue7RMQWN@3
z@rdhyJf=4*3-v%s(bMva&sY~k!Ye;ZGZWWE+_Jt?9UmRxyNIlKUMWiL<?N2Vl7p?6
zs$(k9AF3nx->kk?LwdG$t8Gg!6fET1uBcE+>s27Fh`thwzF8>6QBnkVnSRH{?tx=T
zIi!YzmH1VoM}HD=TS~_Fyk6wO7s(jDCq15V76KLyZ*>CcMx(fg4T6%tScwhs4ii}n
zb}n5RK9^x(w66`<+9^(dSJB<n_o#1H5-&je8`hUWTuE%=Jkt?{%Se>ie1N{~fFltf
z0z(+OvI<TN?rIy3*!xW3U6B4z0I$V_ZnzIg*gJhp0VB=}Cj~h;q-)l0Kae;=u0<Wj
zlbC00YVMrbj&VqDKoC@gpz$*(ihdr?%>)q&#9>*)h|^E`wwH3L#r9|6<1(f*%%z_-
zZSI*@AfJA@jd?*oAuN_FR+xi0d+(z6F7PaR&)Yjl;9Mldajw{655;t&d*E|cI7_*7
zRyYde6Jr7NY5O>jdYmQBZrjI!4D`VaY!<{IZt5_x1P)t6tj|LMD56DC(;f<zAWlwS
zPXXg|vjxC+@w&iz#HNj4LL?9q+(nH0!~xGdTXN8VSHv)n)N7>zTGcPGC@o^zuNPEN
SAF3b2f1_Se!FsDc?)(Sf-wz@H

diff --git a/Importer.cs b/Importer.cs
index 8cda1cc..ce4b783 100644
--- a/Importer.cs
+++ b/Importer.cs
@@ -200,7 +200,7 @@ namespace Smuggler
                         );
                     }
 
-                    var parameter = emissiveChannel.Value.Parameter;
+                    var parameter = baseColorChannel.Value.Parameter;
 
                     effect.BaseColorFactor = new Vector4(
                         parameter.X,
@@ -230,7 +230,10 @@ namespace Smuggler
                 }
             }
 
-            effect.Light = new PBRLight(new Vector3(-0.5f, -0.5f, -0.5f), Color.White.ToVector3());
+            effect.Light = new PBRLight(
+                new Vector3(0.5f, 0.5f, -0.5f), 
+                new Vector3(10f, 10f, 10f)
+            );
 
             /* FIXME: how to load cube maps from GLTF? */
             /*