GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.11

Browse Source 
# Conflicts:
#	Source/Engine/Level/Scene/SceneRendering.cpp
#	Source/Engine/Physics/Colliders/Collider.cpp
#	Source/Engine/Physics/Colliders/Collider.h
This commit is contained in:
Wojtek Figat
2025-09-02 22:23:45 +02:00
parent 826009c1b4 eff5f84185
commit c57e128ff1
53 changed files with 899 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Shaders/Lighting.hlsl
View File

@@ -122,10 +122,6 @@ float4 GetLighting(float3 viewPos, LightData lightData, GBufferSample gBuffer, f
// Calculate shadow
ShadowSample shadow = GetShadow(lightData, gBuffer, shadowMask);
#if !LIGHTING_NO_DIRECTIONAL
// Directional shadowing
shadow.SurfaceShadow *= NoL;
#endif
// Calculate attenuation
if (isRadial)
@@ -139,6 +135,11 @@ float4 GetLighting(float3 viewPos, LightData lightData, GBufferSample gBuffer, f
shadow.TransmissionShadow *= attenuation;
}
#if !LIGHTING_NO_DIRECTIONAL
// Directional shadowing
shadow.SurfaceShadow *= NoL;
#endif
BRANCH
if (shadow.SurfaceShadow + shadow.TransmissionShadow > 0)
{