Skip to content

fix(emat): detect bad format textures #2032

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
alandtse merged 16 commits into from
Mar 31, 2026
Merged

fix(emat): detect bad format textures #2032

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
230e3dd
fix(emat): detect bad textures
doodlum Mar 30, 2026
25e217f
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Mar 30, 2026
8670c25
chore: better detection
doodlum Mar 30, 2026
66c23e1
Merge branch 'emat-detect-bad-textures' of https://github.com/doodlum…
doodlum Mar 30, 2026
ee51087
perf: optimise
doodlum Mar 30, 2026
0b10122
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Mar 30, 2026
f818275
fix: fix nonsense
doodlum Mar 30, 2026
60f62e5
Merge branch 'emat-detect-bad-textures' of https://github.com/doodlum…
doodlum Mar 30, 2026
8ccbcba
fix: fix more nonsense
doodlum Mar 30, 2026
621281e
refactor: cleanup
doodlum Mar 30, 2026
c3593f5
fix: fix nonsense
doodlum Mar 30, 2026
baab248
fix: wake up
doodlum Mar 30, 2026
66b7234
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Mar 30, 2026
2b8b3ad
fix: fix complex materials off
doodlum Mar 30, 2026
5c82877
Merge branch 'emat-detect-bad-textures' of https://github.com/doodlum…
doodlum Mar 30, 2026
efc898f
style: 🎨 apply pre-commit.ci formatting
pre-commit-ci[bot] Mar 30, 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
30 changes: 21 additions & 9 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
float3 refractedViewDirection = viewDirection;
float4 sampledCoatColor = PBRParams2;
float3 complexSpecular = 1.0; // Declare complexSpecular at a higher scope so it's available throughout the shader (NEEDED FOR STOCH. FIX)

# if defined(EMAT)
# if defined(PARALLAX)
if (SharedData::extendedMaterialSettings.EnableParallax) {
Expand All @@ -1081,25 +1082,34 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
bool complexMaterialParallax = false;
float4 complexMaterialColor = 1.0;

# if defined(EMAT_ENVMAP)

# if defined(ENVMAP) || defined(MULTI_LAYER_PARALLAX) || defined(EYE)
float4 envMaskSample = TexEnvMaskSampler.Sample(SampEnvMaskSampler, uv);
float envMaskBase = envMaskSample.x;
if (SharedData::extendedMaterialSettings.EnableComplexMaterial) {
float envMaskTest = TexEnvMaskSampler.SampleLevel(SampEnvMaskSampler, uv, 15).w;
complexMaterial = envMaskTest < (1.0 - (4.0 / 255.0));
const float kMaskEpsilon = (4.0 / 255.0);

complexMaterial = envMaskSample.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))
complexMaterial = false;

if (complexMaterial) {
if (envMaskTest > (4.0 / 255.0)) {
if (envMaskSample.w > kMaskEpsilon) {
complexMaterialParallax = true;
mipLevel = ExtendedMaterials::GetMipLevel(uv, TexEnvMaskSampler, screenNoise);
uv = ExtendedMaterials::GetParallaxCoords(viewPosition.z, uv, mipLevel, viewDirection, tbnTr, screenNoise, TexEnvMaskSampler, SampTerrainParallaxSampler, 3, displacementParams, pixelOffset);
if (SharedData::extendedMaterialSettings.EnableShadows && (parallaxShadowQuality > 0.0f || SharedData::extendedMaterialSettings.ExtendShadows))
sh0 = TexEnvMaskSampler.SampleLevel(SampEnvMaskSampler, uv, mipLevel).w;
complexMaterialColor = TexEnvMaskSampler.Sample(SampEnvMaskSampler, uv);
} else {
complexMaterialColor = envMaskSample;
}

complexMaterialColor = TexEnvMaskSampler.Sample(SampEnvMaskSampler, uv);
envMaskBase = complexMaterialColor.x;
}
}

# endif // ENVMAP

# if defined(TRUE_PBR) && !defined(LANDSCAPE) && !defined(LODLANDSCAPE)
Expand Down Expand Up @@ -1142,6 +1152,8 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
}
# endif // TRUE_PBR

# elif defined(ENVMAP) || defined(MULTI_LAYER_PARALLAX) || defined(EYE)
float envMaskBase = TexEnvMaskSampler.Sample(SampEnvMaskSampler, uv).x;
# endif // EMAT

# if defined(SNOW)
Expand Down Expand Up @@ -2212,7 +2224,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)

if (envMask > 0.0) {
if (EnvmapData.y) {
envMask *= TexEnvMaskSampler.Sample(SampEnvMaskSampler, uv).x;
envMask *= envMaskBase;
} else {
envMask *= glossiness;
}
Expand Down
Loading