birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ATOM-15864] Added diffuseResponse to lambertian diffuse calculation

Browse Source
This commit is contained in:
antonmic
2021-07-01 21:14:04 -07:00
parent 61d0ed0b5c
commit 097f99dcc6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/EnhancedLighting.azsli
+1 -1
View File
@@ -28,7 +28,7 @@ float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lig
}
else
{
diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
}
if(o_clearCoat_feature_enabled)
Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/SkinLighting.azsli
+1 -1
View File
@@ -28,7 +28,7 @@ float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lig
}
else
{
diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
}
if(o_clearCoat_feature_enabled)
Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lighting/StandardLighting.azsli
+1 -1
View File
@@ -20,7 +20,7 @@
// Then define the Diffuse and Specular lighting functions
float3 GetDiffuseLighting(Surface surface, LightingData lightingData, float3 lightIntensity, float3 dirToLight)
{
float3 diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight);
float3 diffuse = DiffuseLambertian(surface.albedo, surface.normal, dirToLight, lightingData.diffuseResponse);
if(o_clearCoat_feature_enabled)
{
Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Microfacet/Brdf.azsli
+2 -2
View File
@@ -21,10 +21,10 @@
// ------- Diffuse Lighting -------
//! Simple Lambertian BRDF.
float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight)
float3 DiffuseLambertian(float3 albedo, float3 normal, float3 dirToLight, float diffuseResponse)
{
float NdotL = saturate(dot(normal, dirToLight));
return albedo * NdotL * INV_PI;
return albedo * NdotL * INV_PI * diffuseResponse;
}
// Normalized Disney diffuse function taken from Frostbite's PBR course notes (page 10):