Skip to content

Fix logic errors and exception in SpecGloss pipeline #2387

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
yaRnMcDonuts merged 3 commits into from
Mar 8, 2025
+6 −10
Merged

Fix logic errors and exception in SpecGloss pipeline #2387

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b846c6a
Fix logic errors and exception in SpecGloss pipeline
yaRnMcDonuts Mar 6, 2025
9b9ba45
fix typo
yaRnMcDonuts Mar 6, 2025
154022e
condense redundant spec gloss code
yaRnMcDonuts Mar 6, 2025
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
16 changes: 6 additions & 10 deletions jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,28 +384,25 @@
//spec gloss tex reads:

#ifdef SPECGLOSSPIPELINE
float glossiness = m_Glossiness;
#ifdef USE_PACKED_SG
vec4 specularColor = texture2D(m_SpecularGlossinessMap, newTexCoord);
float glossiness = specularColor.a * m_Glossiness;
specularColor *= m_Specular;
glossiness *= specularColor.a;
#else
#ifdef SPECULARMAP
vec4 specularColor = texture2D(m_SpecularMap, newTexCoord);
#else
vec4 specularColor = vec4(1.0);
#endif
#ifdef GLOSSINESSMAP
float glossiness = texture2D(m_GlossinesMap, newTexCoord).r * m_Glossiness;
#else
float glossiness = m_Glossiness;
glossiness *= texture2D(m_GlossinesMap, newTexCoord).r;
#endif
specularColor *= m_Specular;
surface.specularColor = specularColor;
#endif
specularColor *= m_Specular;
surface.specularColor = specularColor.rgb;
surface.roughness = 1.0 - glossiness;
#endif



vec3 ao = vec3(1.0);
#ifdef LIGHTMAP
vec3 lightMapColor;
Expand Down Expand Up @@ -475,7 +472,6 @@

#ifdef SPECGLOSSPIPELINE
surface.diffuseColor = surface.albedo;// * (1.0 - max(max(specularColor.r, specularColor.g), specularColor.b));
surface.roughness = 1.0 - m_Glossiness;
surface.fZero = surface.specularColor.xyz;
#else
surface.specularColor = (0.04 - 0.04 * surface.metallic) + surface.albedo * surface.metallic; // 0.04 is the standard base specular reflectance for non-metallic surfaces in PBR. While values like 0.08 can be used for different implementations, 0.04 aligns with Khronos' PBR specification.
Expand Down