Skip to content

fix(emat): allow solid-black height-only masks #2441

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
SkrubbySkrubInAShrub merged 4 commits into from
Jun 1, 2026
Merged

fix(emat): allow solid-black height-only masks #2441

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25085fd
fix(emat): preserve parallax for grayscale complex masks
FIocker May 30, 2026
d31ccf8
Merge branch 'dev' into fix/emat-preserve-parallax-grayscale-masks-20…
FIocker May 31, 2026
0427e19
fix(emat): allow solid-black height-only masks
FIocker May 31, 2026
6467601
Merge branch 'dev' into fix/emat-preserve-parallax-grayscale-masks-20…
FIocker Jun 1, 2026
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
17 changes: 11 additions & 6 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,12 +1120,17 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
if (SharedData::extendedMaterialSettings.EnableComplexMaterial) {
const float kMaskEpsilon = (4.0 / 255.0);

complexMaterial = TexEnvMaskSampler.SampleLevel(SampEnvMaskSampler, uv, 15).w < (1.0 - kMaskEpsilon);

// Detect texture saved in the wrong format
if ((abs(envMaskSample.x - envMaskSample.y) < kMaskEpsilon) &&
(abs(envMaskSample.x - envMaskSample.z) < kMaskEpsilon) &&
(abs(envMaskSample.y - envMaskSample.z) < kMaskEpsilon))
const float4 mipSample = TexEnvMaskSampler.SampleLevel(SampEnvMaskSampler, uv, 15);
complexMaterial = mipSample.w < (1.0 - kMaskEpsilon);

const bool grayscaleMask = (abs(mipSample.x - mipSample.y) < kMaskEpsilon) &&
(abs(mipSample.x - mipSample.z) < kMaskEpsilon) &&
(abs(mipSample.y - mipSample.z) < kMaskEpsilon);
// Preserve height-only masks while rejecting grayscale environment masks
const bool solidBlackHeightMask = all(mipSample.xyz < kMaskEpsilon) &&
mipSample.w > kMaskEpsilon &&
mipSample.w < (1.0 - kMaskEpsilon);
if (grayscaleMask && !solidBlackHeightMask)
complexMaterial = false;

if (complexMaterial) {
Expand Down
Loading