Merge pull request #2387 from jMonkeyEngine/yaRnMcDonuts-patch-2

Fix logic errors and exception in SpecGloss pipeline

Author: yaRnMcDonuts

jme3-core/src/main/resources/Common/ShaderLib/module/pbrlighting/PBRLightingUtils.glsllib

@@ -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;
@@ -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.