Skip to content

fix: terrain variation broken parallax shadows & incorrect mipmapping. #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 1 commit into from
Jun 8, 2025
Merged

fix: terrain variation broken parallax shadows & incorrect mipmapping. #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/Terrain Variation/Shaders/TerrainVariation/TerrainVariation.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ inline float4 StochasticEffect(float rnd, float mipLevel, Texture2D tex, Sampler
{
// If feature is disabled, return standard sample
if (!SharedData::terrainVariationSettings.enableTilingFix)
return tex.SampleLevel(samp, uv, mipLevel);
return tex.SampleGrad(samp, uv, dx, dy);

// Calculate distance factor (0 when close, 1 when far)
float distanceFactor = ComputeDistanceFactor(distance);
Expand Down
29 changes: 29 additions & 0 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,6 +2523,35 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)

float parallaxShadow = 1;

# if defined(EMAT)
[branch] if (
SharedData::extendedMaterialSettings.EnableShadows &&
!(light.lightFlags & LightLimitFix::LightFlags::Simple) &&
lightAngle > 0.0 &&
shadowComponent != 0.0 &&
contactShadow != 0.0)
{
float3 lightDirectionTS = normalize(mul(refractedLightDirection, tbn).xyz);
# if defined(PARALLAX)
[branch] if (SharedData::extendedMaterialSettings.EnableParallax)
parallaxShadow = ExtendedMaterials::GetParallaxSoftShadowMultiplier(uv, mipLevel, lightDirectionTS, sh0, TexParallaxSampler, SampParallaxSampler, 0, parallaxShadowQuality, screenNoise, displacementParams);
# elif defined(LANDSCAPE)
[branch] if (SharedData::extendedMaterialSettings.EnableTerrainParallax)
# if defined(TERRAIN_VARIATION)
parallaxShadow = ExtendedMaterials::GetParallaxSoftShadowMultiplierTerrain(input, uv, mipLevels, lightDirectionTS, sh0, parallaxShadowQuality, screenNoise, displacementParams, sharedOffset, dx, dy, viewDistance);
# else
parallaxShadow = ExtendedMaterials::GetParallaxSoftShadowMultiplierTerrain(input, uv, mipLevels, lightDirectionTS, sh0, parallaxShadowQuality, screenNoise, displacementParams);
# endif
# elif defined(EMAT_ENVMAP)
[branch] if (complexMaterialParallax)
parallaxShadow = ExtendedMaterials::GetParallaxSoftShadowMultiplier(uv, mipLevel, lightDirectionTS, sh0, TexEnvMaskSampler, SampEnvMaskSampler, 3, parallaxShadowQuality, screenNoise, displacementParams);
# elif defined(TRUE_PBR) && !defined(LODLANDSCAPE)
[branch] if (PBRParallax)
parallaxShadow = ExtendedMaterials::GetParallaxSoftShadowMultiplier(uv, mipLevel, lightDirectionTS, sh0, TexParallaxSampler, SampParallaxSampler, 0, parallaxShadowQuality, screenNoise, displacementParams);
# endif
}
# endif

# if defined(TRUE_PBR)
{
PBR::LightProperties lightProperties = PBR::InitLightProperties(lightColor, lightShadow * contactShadow, parallaxShadow);
Expand Down