Trying to fix shading

res/shaders/lib/BRDF.slang

@@ -25,12 +25,12 @@ struct BlinnPhong : IBRDF
 
     float3 evaluate(float3x3 tbn, float3 viewDir_WS, float3 lightDir_WS, float3 lightColor)
     {
-        float3 normal_WS = mul(tbn, normal);
+        float3 normal_WS = mul(normal, tbn);
         float diffuse = max(dot(normal_WS, lightDir_WS), 0);
         float3 h = lightDir_WS + viewDir_WS;
         float specular = dot(normal_WS, h);
 		
-        return baseColor * (diffuse + specular) * lightColor;
+        return (viewDir_WS + float3(1, 1, 1)) / 2;//baseColor * (diffuse + specular) * lightColor;
     }
 };
 

res/shaders/lib/LightEnv.slang

@@ -28,7 +28,7 @@ struct PointLight : ILightEnv
         float3 lightDir_WS = position_WS.xyz - params.position_WS;
         float d = length(lightDir_WS);
         float illuminance = max(1 - d / colorRange.w, 0);
-        return illuminance * brdf.evaluate(params.tbn, params.viewDir_WS, normalize(lightDir_WS), colorRange.xyz);
+        return brdf.evaluate(params.tbn, params.viewDir_WS, normalize(lightDir_WS), colorRange.xyz);
     }
 
     bool insidePlane(Plane plane)

res/shaders/lib/MaterialParameter.slang

@@ -39,7 +39,7 @@ struct FragmentParameter
 		LightingParameter result;
 		result.tbn = float3x3(normalize(tangent_WS), normalize(biTangent_WS), normalize(normal_WS));
 		result.position_WS = position_WS;
-		result.viewDir_WS = viewDir_WS;
+		result.viewDir_WS = normalize(viewDir_WS);
 		return result;
 	}
 };