From ff9530b4bbc0a4b0665b2de380bcfac206960286 Mon Sep 17 00:00:00 2001
From: omicronrex <65692652+omicronrex@users.noreply.github.com>
Date: Tue, 27 Aug 2024 17:26:39 -0300
Subject: [PATCH] fix specular + add support for roughness

---
 .gitignore |  1 +
 pixel.hlsl | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d65c575..af13661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .zig-cache/
 zig-out/
+test/
 *.glb
 *.gex
 *.bat
diff --git a/pixel.hlsl b/pixel.hlsl
index 281d68e..b30cc04 100644
--- a/pixel.hlsl
+++ b/pixel.hlsl
@@ -41,19 +41,21 @@ float3 uEyePos;
         return (saturate(dot(-normal, diffvec/len)) * atten) * color;
     }
 
-    float4 doLighting(float4 color, float3 wpos, float3 normal, float4 ambient, float metal, float3 eyevector, float4 environment) {
-        float4 diffuse = ambient + (environment - ambient) * metal;
+    float4 doLighting(float4 color, float3 wpos, float3 normal, float4 ambient, float metal, float rough, float3 eyevector, float4 environment) {
+        float4 diffuse = ambient;
         float4 specular = float4(0,0,0,0);            
 
         for (int i = 0; i < 8; i++) {
             float3 dir = -normalize(uLightDirection[i].xyz);
         
-            diffuse += saturate(dot(normal,dir)) * uLightColor[i] * (1.0-metal);
-            specular += pow(max(dot(reflect(-dir,normal),eyevector), 0.0), 40.0) * uLightColor[i];    
+            diffuse += saturate(dot(normal,dir)) * uLightColor[i];
+            specular += (1.0-0.9*rough) * pow(max(dot(reflect(dir,normal),eyevector), 0.0), 200.0/(1.0+rough*100.0)) * uLightColor[i];    
 
             //accumcol += doPointLight(wpos, normal, uLightPosRange[i], uLightColor[i]);
         }
 
+        diffuse = lerp(diffuse,diffuse*lerp(environment,ambient,rough),metal);
+
         return saturate(diffuse) * color + saturate(specular) * color.a;
     }
 //end game maker lighting
@@ -108,7 +110,7 @@ PS_OUTPUT main(PS_INPUT input) {
     
     if (uOcclusionMap_enabled<0.5) occlusion=float4(1.0,1.0,1.0,1.0);
     
-    if (uLightingEnabled>0.5) color = doLighting(color, input.worldpos, finormal, uAmbientColor * occlusion, metal, eyevector, environment);
+    if (uLightingEnabled>0.5) color = doLighting(color, input.worldpos, finormal, uAmbientColor * occlusion, metal, rough, eyevector, environment);
     
     if (uEmissiveMap_enabled>0.5) color = saturate(color+emissive);