Skip to content

Fix SPTerrainLighting.frag missing SpecularMap support #2654

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 2 commits into from
Mar 24, 2026
Merged

Fix SPTerrainLighting.frag missing SpecularMap support #2654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7304316
Initial plan
Copilot Mar 22, 2026
d100e8d
Fix SPTerrainLighting to sample SpecularMap like MultiPass shader
Copilot Mar 22, 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
21 changes: 19 additions & 2 deletions jme3-terrain/src/main/resources/Common/MatDefs/Terrain/SPTerrainLighting.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#import "Common/ShaderLib/Lighting.glsllib"

uniform float m_Shininess;
#ifdef SPECULARMAP
uniform sampler2D m_SpecularMap;
#endif

varying vec4 AmbientSum;
varying vec4 DiffuseSum;
Expand Down Expand Up @@ -615,6 +618,20 @@ void main(){
#endif


//-----------------------
// read shininess or specularColor from specularMap
//-----------------------
vec4 specularColor = vec4(1.0);
float finalShininessValue = m_Shininess;
#ifdef SPECULARMAP
vec4 specularMapColor = texture2D(m_SpecularMap, texCoord);
#ifdef USE_SPECULARMAP_AS_SHININESS
finalShininessValue = specularMapColor.r; //assumes that specularMap is a gray-scale reflectivity/shininess map
#else
specularColor = specularMapColor;
#endif
#endif

//-----------------------
// lighting calculations
//-----------------------
Expand Down Expand Up @@ -646,9 +663,9 @@ void main(){
vec3 viewDir = normalize(-vPos.xyz);
#endif

vec2 light = computeLighting(normal, viewDir, lightDir.xyz, lightDir.w * spotFallOff, m_Shininess);
vec2 light = computeLighting(normal, viewDir, lightDir.xyz, lightDir.w * spotFallOff, finalShininessValue);
gl_FragColor.rgb += DiffuseSum.rgb * lightColor.rgb * diffuseColor.rgb * vec3(light.x) +
SpecularSum.rgb * vec3(light.y);
SpecularSum.rgb * specularColor.rgb * vec3(light.y);
}

}
1 change: 1 addition & 0 deletions jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.j3md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ MaterialDef Terrain Lighting {
DIFFUSEMAP_11_SCALE : DiffuseMap_11_scale

USE_ALPHA : useDiffuseAlpha
USE_SPECULARMAP_AS_SHININESS : useSpecularMapAsShininess
}
}

Expand Down
Loading