Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix missing changes from e851efa0a8 and ef551c36ae on ForwardShading

Browse Source
This commit is contained in:
Wojciech Figat
2026-02-11 00:25:00 +01:00
parent f045b5b6b6
commit c978ab2b84
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
+10 -7
View File
@@ -30,6 +30,7 @@ TextureCube SkyLightTexture : register(t__SRV__);
Buffer<float4> ShadowsBuffer : register(t__SRV__); Buffer<float4> ShadowsBuffer : register(t__SRV__);
Texture2D<float> ShadowMap : register(t__SRV__); Texture2D<float> ShadowMap : register(t__SRV__);
Texture3D VolumetricFogTexture : register(t__SRV__); Texture3D VolumetricFogTexture : register(t__SRV__);
Texture2D PreIntegratedGF : register(t__SRV__);
@4// Forward Shading: Utilities @4// Forward Shading: Utilities
// Public accessors for lighting data, use them as data binding might change but those methods will remain. // Public accessors for lighting data, use them as data binding might change but those methods will remain.
LightData GetDirectionalLight() { return DirectionalLight; } LightData GetDirectionalLight() { return DirectionalLight; }
@@ -111,7 +112,8 @@ void PS_Forward(
// Calculate reflections // Calculate reflections
#if USE_REFLECTIONS #if USE_REFLECTIONS
float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb; float4 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness);
reflections.rgb *= reflections.a;
#if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
// Screen Space Reflections // Screen Space Reflections
@@ -127,7 +129,7 @@ void PS_Forward(
if (hit.z > 0) if (hit.z > 0)
{ {
float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb; float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
reflections = lerp(reflections, screenColor, hit.z); reflections.rgb = lerp(reflections.rgb, screenColor, hit.z);
} }
// Fallback to software tracing if possible // Fallback to software tracing if possible
@@ -139,17 +141,17 @@ void PS_Forward(
if (TraceSDFSoftwareReflections(gBuffer, reflectWS, surfaceAtlas)) if (TraceSDFSoftwareReflections(gBuffer, reflectWS, surfaceAtlas))
{ {
float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb; float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
reflections = lerp(surfaceAtlas, float4(screenColor, 1), hit.z); reflections.rgb = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
} }
} }
#endif #endif
#endif #endif
light.rgb += reflections * GetReflectionSpecularLighting(ViewPos, gBuffer) * light.a; light.rgb += reflections.rgb * GetReflectionSpecularLighting(PreIntegratedGF, ViewPos, gBuffer);
#endif #endif
// Add lighting (apply ambient occlusion) // Add lighting
output.rgb += light.rgb * gBuffer.AO; output.rgb += light.rgb;
#endif #endif
@@ -161,7 +163,8 @@ void PS_Forward(
#else #else
float fogSceneDistance = gBuffer.ViewPos.z; float fogSceneDistance = gBuffer.ViewPos.z;
#endif #endif
float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, fogSceneDistance); float fogSkipDistance = max(ExponentialHeightFog.VolumetricFogMaxDistance - 100, 0);
float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, fogSkipDistance, fogSceneDistance);
if (ExponentialHeightFog.VolumetricFogMaxDistance > 0) if (ExponentialHeightFog.VolumetricFogMaxDistance > 0)
{ {
// Sample volumetric fog and mix it in // Sample volumetric fog and mix it in