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

Move penumbra computation back to original place.

Browse Source 
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
This commit is contained in:
Santi Paprika
2021-12-23 18:21:18 +01:00
parent 038c71a660
commit 6e3ada487e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/Lights/DiskLight.azsli
+10 -10
View File
@@ -77,16 +77,6 @@ void ApplyDiskLight(ViewSrg::DiskLight light, Surface surface, inout LightingDat
// shadow
float litRatio = 1.0;
if (useConeAngle && dotWithDirection < light.m_cosInnerConeAngle) // in penumbra
{
// Normalize into 0.0 - 1.0 space.
float penumbraMask = (dotWithDirection - light.m_cosOuterConeAngle) / (light.m_cosInnerConeAngle - light.m_cosOuterConeAngle);
// Apply smoothstep
penumbraMask = penumbraMask * penumbraMask * (3.0 - 2.0 * penumbraMask);
lightIntensity *= penumbraMask;
}
// Distance travelled by the light inside the object. If not redefined, it will take mode-specific null behaviors (see GetBackLighting())
float transmissionDistance = -1.0f;
@@ -110,7 +100,17 @@ void ApplyDiskLight(ViewSrg::DiskLight light, Surface surface, inout LightingDat
{
transmissionDistance = ProjectedShadow::GetThickness(light.m_shadowIndex, surface.position - lightingData.shrinkFactor * surface.vertexNormal);
}
}
if (useConeAngle && dotWithDirection < light.m_cosInnerConeAngle) // in penumbra
{
// Normalize into 0.0 - 1.0 space.
float penumbraMask = (dotWithDirection - light.m_cosOuterConeAngle) / (light.m_cosInnerConeAngle - light.m_cosOuterConeAngle);
// Apply smoothstep
penumbraMask = penumbraMask * penumbraMask * (3.0 - 2.0 * penumbraMask);
lightIntensity *= penumbraMask;
}
// Diffuse contribution