From 7ebf34c3e0c75f33ff642da27d75834934170646 Mon Sep 17 00:00:00 2001
From: Dane Johnson <dane_johnson@ymail.com>
Date: Thu, 21 Jan 2021 18:03:50 -0600
Subject: [PATCH] Phong lighting, flat shader

---
 demo/main.lua     |   8 +++++---
 demo/trough.glb   | Bin 75748 -> 75748 bytes
 shaders/flat.frag |  18 ++----------------
 shaders/flat.vert |  31 ++++++++++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/demo/main.lua b/demo/main.lua
index cf8ecfb..9154ec3 100644
--- a/demo/main.lua
+++ b/demo/main.lua
@@ -27,10 +27,11 @@ function init()
    camera.transform:Translate(0.0, 0.0, 10.0)
 
    light = couch.DirectionalLight.new()
-   light.direction = couch.Vector3(0.0, 0.0, -1.0)
+   light.direction = couch.Vector3(0.0, -1.0, 0.0)
    light.color = couch.Vector3(1.0, 1.0, 1.0)
-   light.ambient = 0.4
+   light.ambient = 0.2
    light.diffuse = 1.0
+   light.specular = 0.0001
    couch.Node.GetRoot().children:Append(light)
    
    ball = couch.Mesh.FromFile("cube.glb")
@@ -112,9 +113,10 @@ function onkey(key, code, action, mod)
    end
 
    if key == couch.KEY_DOWN and action == couch.ACTION_PRESS then
-      light.ambient = light.ambient - 0.1
+      light.ambient = max(light.ambient - 0.1, 0.0)
    elseif key == couch.KEY_UP and action == couch.ACTION_PRESS then
       light.ambient = light.ambient + 0.1
+      print(light.ambient)
    end
 end
 
diff --git a/demo/trough.glb b/demo/trough.glb
index 9ad428addbb957b28ac3c1dbfb675d5c39319731..aa416a0ef71a71953b454fd6921283225b6a75f3 100644
GIT binary patch
delta 1157
zcmb7BOK1~O6g}06Y17nSO`0_QtLfj=MDT;YOKAkLxKI$(idsSXLEID?wa^g-E!39c
z1g%o*Mhuco5lyp6A_%T3T?n-ZF2pX1_=(V6vGu;_#IZPti+Aq1@11wfo4Iq-%G|Uv
zv0znamHt#i>(V{|S9syV*toEC_M{}|Es|iOk!SKaqmj(yF8#${zpLs2Sy6mw?^B~`
zXly*GboNl!y~qxIe@5x2#@3~TOqapS%W6vJy56WU@l4Gq>OYNG^jpI`WenECRy^(x
zjmhJFYE=FLv)BEnY05aJm7c#wLn}2hKQjXP8}<1agUyVL8aB<2&&<cDIr3sq)ZOtD
z*W3)bH0;(?n`74r<s6+Hh>6NKdE(XaI^unDsp)KQO<p9tuOX?E`yXE4O*U8iNt?2{
z)Ppw{#hH)YLhCzEv1nSfUH>LV-8)IIVKy7v@1n0SFDJt9LPD=HB+mK+eFKS-NDJxp
zbJreverj0gwXD6FW*1btovx*;^MYhf(C5<oV>EI00exv3658ozddNX<V~3Mf9V0?s
z40Atn^gcC}w`9IbUhF>9k-T*yNb}(U1zRHGNytN9D$VxKCI^K-{z!}FyDNHniF|xk
z-rh@7k2Uc<L{!54M0_;qTnr2CQ+}~pgKbcF<slzU2rvea3oBN^!f1hwhf@nLqZg~O
z2HR23SdScduoeyQ!-p#7lKC^N2wPE!B3_%Y86|Ktx>1f&Y=M)}iS^hB7aWWZFV>+9
g8&JSlfMQgm4t5lx0*%ZiE0pY7)IJ%t=j`_U04$zal>h($

delta 1173
zcmah{Ur1AN6#mTF(k=U=+2*F3Ryvn9ok1k@JB%#|q=%vcGYW&yvYrH23f)mqLL|~g
znJj$?Bo-kN%a`2+K`#|TK}pa<<bx0WG4M^&&Ts5q?iRyc_MPwi?svX(emh&3GcC-S
zW|qwgGM`AALqyUm@kzC$Z-C}a*QvR4HKm>N>wHbxs9~O7M=w3|HOhacpIFq=xq3)8
z?w^=`VQd_ZPYP4tK$_3@Yv)G2ynv>Wd~Ho34v_*H>Yq^7HIfFpQK5mj0ck@^eSsl#
zjqaoHbcO<+C}$wOz^IYjaI+juc6~X&ka10V<7{6=+qbc?vB0>q{Ne)5^c@$_)3s4M
zof%1r<FD_W5Z(uVVv>ocO&2mR)F~fzobr<v>pqu?_g&shp-ov5TK@gxLp9LoCs`-Y
z&FWRcH&66!nO%`hJ}fKLed~`Hw;#}BboeqQ6HDUvo1s+fYgmsl*2fRq=*aL$$~hg>
zqx6|&eQi&G=GpJ(#SVIPc2sEb{!$a&SQI3ELp~d2^DdGFF*f{?Jf_z7j)~~G06pe>
z=KK`>>b@&39qm=`-410gB@4$+KB87vkQQU@6bep@=V1pmP>r5H<GgZZh@wv|Huucz
zxLUOm6Mw@*P8PX(2I<|Cs2CU|@^K#hVX0Ou@WI6229#nW+8Eo=0yD}`%vj8SqYWs5
zhtY#(Y(f#dj9#>(37cW($Ax|Hb0)cDJ5dQYqZ_-h2la3;I#7!mY=@1}hTYf-D=HW(
k8c+o%s!`5Zj&0b2y=dg86?NFbndHoFCaf<L)}n)se+#Q-OaK4?

diff --git a/shaders/flat.frag b/shaders/flat.frag
index 4abea14..10c6970 100644
--- a/shaders/flat.frag
+++ b/shaders/flat.frag
@@ -2,6 +2,7 @@
 
 in vec3 UV;
 in vec3 NORMAL;
+in vec3 LIGHT;
 
 out vec4 FragColor;
 
@@ -14,16 +15,7 @@ struct Material {
   bool unshaded;
 };
 
-struct DirectionalLight {
-  vec3 direction;
-  vec3 color;
-  float ambient;
-  float diffuse;
-  float specular;
-};
-
 uniform Material material;
-uniform DirectionalLight directionalLight;
 
 void main() {
   FragColor = vec4(0.0);
@@ -38,12 +30,6 @@ void main() {
   }
 
   if (!material.unshaded) {
-    vec3 ambient = directionalLight.ambient * directionalLight.color;
-    ambient = max(ambient, 0.0);
-    
-    vec3 diffuse = directionalLight.diffuse * dot(directionalLight.direction, NORMAL) * directionalLight.color;
-    diffuse = max(diffuse, 0.0);
-    
-    FragColor *= vec4(ambient + diffuse, 1.0);
+    FragColor *= vec4(LIGHT, 1.0);
   }
 }
diff --git a/shaders/flat.vert b/shaders/flat.vert
index 89102ab..486f2f2 100644
--- a/shaders/flat.vert
+++ b/shaders/flat.vert
@@ -10,10 +10,39 @@ uniform mat4 PROJECTION;
 
 out vec3 UV;
 out vec3 NORMAL;
+out vec3 LIGHT;
+
+struct DirectionalLight {
+  vec3 direction;
+  vec3 color;
+  float ambient;
+  float diffuse;
+  float specular;
+};
+
+uniform DirectionalLight directionalLight;
 
 void main() {
   vec4 vertex = PROJECTION * VIEW * MODEL * vec4(pos, 1.0);
   gl_Position = vertex;
   UV = vec3(uv * vertex.z, vertex.z);
-  NORMAL = (PROJECTION * VIEW * MODEL * vec4(normal, 0.0)).xyz;
+
+  NORMAL = (VIEW * MODEL * vec4(normal, 0.0)).xyz;
+
+  // Flat shading, we compute light per vertex
+  vec3 ambient = directionalLight.ambient * directionalLight.color;
+
+  vec3 direction = -(VIEW * vec4(directionalLight.direction, 0.0)).xyz;
+  float diff = dot(normalize(direction), normalize(NORMAL));
+  diff = max(diff, 0.0);
+  vec3 diffuse = directionalLight.diffuse * diff * directionalLight.color;
+
+  vec3 viewDir = (VIEW * MODEL * vec4(pos, 1.0)).xyz;
+  vec3 reflectionDir = reflect(normalize(direction), normalize(NORMAL));
+  float spec = dot(viewDir, reflectionDir);
+  spec = max(spec, 0.0);
+  spec = pow(spec, 2);
+  vec3 specular = directionalLight.specular * spec * directionalLight.color;
+
+  LIGHT = ambient + diffuse + specular;
 }