From 0ea3484ec3f0942f4fc45de806a20d9461af049a Mon Sep 17 00:00:00 2001
From: Evan Hemsley <evan@moonside.games>
Date: Sat, 1 Aug 2020 13:43:04 -0700
Subject: [PATCH] i think the lighting works now

---
 Effects/PBREffect.cs  |  24 +++++++++++++++++++-----
 Effects/PBREffect.fx  |  12 ++++++------
 Effects/PBREffect.fxb | Bin 8852 -> 8844 bytes
 Importer.cs           |  26 +++++++++++++-------------
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/Effects/PBREffect.cs b/Effects/PBREffect.cs
index ba73003..852bde2 100644
--- a/Effects/PBREffect.cs
+++ b/Effects/PBREffect.cs
@@ -88,8 +88,14 @@ namespace Smuggler
             { 
                 world = value;
                 worldParam.SetValue(world);
-                worldViewProjectionParam.SetValue(world * view * projection);
-                worldInverseTransposeParam.SetValue(Matrix.Transpose(Matrix.Invert(world)));
+
+                Matrix.Multiply(ref world, ref view, out Matrix worldView);
+                Matrix.Multiply(ref worldView, ref projection, out Matrix worldViewProj);
+                worldViewProjectionParam.SetValue(worldViewProj);
+
+                Matrix.Invert(ref world, out Matrix worldInverse);
+                Matrix.Transpose(ref worldInverse, out Matrix worldInverseTranspose);
+                worldInverseTransposeParam.SetValue(worldInverseTranspose);
             }
         }
 
@@ -100,8 +106,13 @@ namespace Smuggler
             { 
                 view = value;
                 viewParam.SetValue(view);
-                worldViewProjectionParam.SetValue(world * view * projection);
-                eyePositionParam.SetValue(Matrix.Invert(view).Translation);
+
+                Matrix.Multiply(ref world, ref view, out Matrix worldView);
+                Matrix.Multiply(ref worldView, ref projection, out Matrix worldViewProj);
+                worldViewProjectionParam.SetValue(worldViewProj);          
+                
+                Matrix.Invert(ref view, out Matrix inverseView);
+                eyePositionParam.SetValue(inverseView.Translation);
             }
         }
 
@@ -112,7 +123,10 @@ namespace Smuggler
             { 
                 projection = value;
                 projectionParam.SetValue(projection);
-                worldViewProjectionParam.SetValue(world * view * projection);
+
+                Matrix.Multiply(ref world, ref view, out Matrix worldView);
+                Matrix.Multiply(ref worldView, ref projection, out Matrix worldViewProj);
+                worldViewProjectionParam.SetValue(worldViewProj);   
             }
         }
 
diff --git a/Effects/PBREffect.fx b/Effects/PBREffect.fx
index e26bd49..28dd3b5 100644
--- a/Effects/PBREffect.fx
+++ b/Effects/PBREffect.fx
@@ -52,10 +52,10 @@ struct PixelShaderInput
 PixelShaderInput main_vs(VertexShaderInput input)
 {
     PixelShaderInput output;
-
+   
     output.PositionWS = mul(input.Position, World).xyz;
     output.TexCoord = input.TexCoord;
-    output.NormalWS = normalize(mul(WorldInverseTranspose, input.Normal));
+    output.NormalWS = normalize(mul(input.Normal, (float3x3)WorldInverseTranspose));
 
     output.Position = mul(input.Position, WorldViewProjection);
     return output;
@@ -107,6 +107,9 @@ float4 None(PixelShaderInput input) : SV_TARGET
     float3 N = normalize(input.NormalWS);
     float3 V = normalize(EyePosition - input.PositionWS);
 
+    float3 F0 = float3(0.04, 0.04, 0.04);
+    F0 = lerp(F0, Albedo, Metallic);
+
     float3 Lo = float3(0.0, 0.0, 0.0);
 
     for (int i = 0; i < 4; i++)
@@ -119,12 +122,9 @@ float4 None(PixelShaderInput input) : SV_TARGET
         float attenuation = 1.0 / (distance * distance);
         float3 radiance = LightColors[i] * attenuation;
 
-        float3 F0 = float3(0.04, 0.04, 0.04);
-        F0 = lerp(F0, Albedo, Metallic);
-        float3 F = FresnelSchlick(max(dot(H, V), 0.0), F0);
-
         float NDF = DistributionGGX(N, H, Roughness);
         float G = GeometrySmith(N, V, L, Roughness);
+        float3 F = FresnelSchlick(max(dot(H, V), 0.0), F0);
 
         float3 numerator = NDF * G * F;
         float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0);
diff --git a/Effects/PBREffect.fxb b/Effects/PBREffect.fxb
index bcc23fa9549d9cd0d2f7e549485601743026db86..2a7a43f902c350f774e6f67a1944209a06d98c3f 100644
GIT binary patch
delta 773
zcmcgpJxF6g5T1G2XCj(pUp5IzG<p&B?l_y2A|e6pyh<KeC{b)JZ4Wlx!C43+*hxUH
zxhlu=N)fTN(aKVUbP5VK!X0=s`}}KceX#p>cD|YK`*ybHHs?B1nchQi-|Y;|W+rGQ
zyOGYtH=yKCm)T+3&uY?IqoJDK!xRO9p>^G#Hm{KVRL>f+nGR|>F?LlOy4JINst4bC
z1ZroZ{a^&^(Dnfm2r28qgIfsT`QX_cgl*<kl0(jM5o1G2nn^@znA$M31q*;S!8yTl
z=z0i&M=dipmF7C>yKPg<!w|-Htq=FMkK+XQ2KdEXPxX>_TwH%?mdEb777~g%SVK!R
zExyvkgrbwy@{<K0x=uq6B&}i&(X8lqzJ?(+E1#o(`Ef*`tJ0SsCRdI;6mn`7tNadZ
zkd6w5mdc+BY|XV3)T4ctbXNRYh$VP@FHfd;iG;u91}d7a#B_gXzO?&3Y*DkafPK&&
z<;NHA9%0eY=|JYurpIpw5Zk;Nc*~|t@x|uq;FC?6s7x^K5Yq9W*z~Jn^JDdd_q*y2
n?>~mh_&xeLbb<AF(9*8EmE@tsvFGB{bF5t4D{*x2;T-=1cf_lc

delta 765
zcmcgqziSjx5T4n6m%B6P?rq-Pk-N*~OfZoUo0Lb85HMA=k_8(%#J|AQ3NN)O4o0w(
z1+hsL*`yN`EN$XnAi||e5ksn=62EzypoO&yZ<m=j^Zl6FosE|pd#h1(jr{ZdgWQd7
zi>ZHP60TdGlBcniT6|5mqOI$;s3L=JMNXqW*CdJis9K5Na9xtb%CoqJ_^7_A+2r|z
z^U(QzGS4e%Rw4?SDlVW4f0!sJ5xXg(45&u$*x!-XO4$xLlyy7TPcyA0)FSU|5qb=W
zaYnZ7!fNEm_l{fzJb-f{jZuH@CJ~3gCfWs8dfBh{7szS<H~VPe9C#EOa6rShYI^vW
zCg@Y0@}x0nGL1dP1eKiuhiWEy*O<fHhMlGSXJe5$mE-B<q#!q*JXLZTwt8g{WomG<
zJ!nFy2h$o41R^6}TKAiUfB<<Nn88s2Kicb{xzj1g4&>hS>;J)(4?7QdGR<yc@aj7d
zZdp0(Mwb=?V$8Czc+&m1Mcv;Yi;rinEb1<GcSS$Rrx~?a>Z!$Bz0Y``^<LrqVz$kr
t{O#;l9$<PHT#QwZGp2N;zmLXcAJd4imaAOV=XQOrD!-C$et6?O{|3e8rSkv)

diff --git a/Importer.cs b/Importer.cs
index 7f1b75c..ff13912 100644
--- a/Importer.cs
+++ b/Importer.cs
@@ -231,24 +231,24 @@ namespace Smuggler
             effect.AO = 1f;
 
             effect.Lights[0] = new PBRLight(
-                new Vector3(-10f, 10f, 10f),
+                new Vector3(-10f, 10f, -10f),
                 new Vector3(300f, 300f, 300f)
             );
 
-            effect.Lights[1] = new PBRLight(
-                new Vector3(10f, 10f, 10f),
-                new Vector3(300f, 300f, 300f)
-            );
+            // effect.Lights[1] = new PBRLight(
+            //     new Vector3(10f, 10f, 10f),
+            //     new Vector3(300f, 300f, 300f)
+            // );
 
-            effect.Lights[2] = new PBRLight(
-                new Vector3(-10f, -10f, 10f),
-                new Vector3(300f, 300f, 300f)
-            );
+            // effect.Lights[2] = new PBRLight(
+            //     new Vector3(-10f, -10f, 10f),
+            //     new Vector3(300f, 300f, 300f)
+            // );
 
-            effect.Lights[3] = new PBRLight(
-                new Vector3(10f, -10f, 10f), 
-                new Vector3(300f, 300f, 300f)
-            );
+            // effect.Lights[3] = new PBRLight(
+            //     new Vector3(10f, -10f, 10f), 
+            //     new Vector3(300f, 300f, 300f)
+            // );
 
             /* FIXME: how to load cube maps from GLTF? */
             /*