sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a crash in the PBR shader when adding a light map.

Browse Source
This commit is contained in:
Nehon 2017-02-06 19:48:49 +01:00
parent 09ce6205c7
commit 0610f703d7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jme3-core/src/main/resources/Common/MatDefs/Light/PBRLighting.frag
View File

@ -148,18 +148,6 @@ void main(){
vec3 normal = normalize(wNormal); vec3 normal = normalize(wNormal);
#endif #endif
#ifdef LIGHTMAP
vec3 lightMapColor;
#ifdef SEPARATE_TEXCOORD
lightMapColor = texture2D(m_LightMap, texCoord2).rgb;
#else
lightMapColor = texture2D(m_LightMap, texCoord).rgb;
#endif
specularColor.rgb *= lightMapColor;
albedo.rgb *= lightMapColor;
#endif
float specular = 0.5; float specular = 0.5;
#ifdef SPECGLOSSPIPELINE #ifdef SPECGLOSSPIPELINE
vec4 specularColor = texture2D(m_SpecularMap, newTexCoord); vec4 specularColor = texture2D(m_SpecularMap, newTexCoord);
@ -171,6 +159,17 @@ void main(){
vec4 diffuseColor = albedo - albedo * Metallic; vec4 diffuseColor = albedo - albedo * Metallic;
#endif #endif
#ifdef LIGHTMAP
vec3 lightMapColor;
#ifdef SEPARATE_TEXCOORD
lightMapColor = texture2D(m_LightMap, texCoord2).rgb;
#else
lightMapColor = texture2D(m_LightMap, texCoord).rgb;
#endif
specularColor.rgb *= lightMapColor;
albedo.rgb *= lightMapColor;
#endif
gl_FragColor.rgb = vec3(0.0); gl_FragColor.rgb = vec3(0.0);
float ndotv = max( dot( normal, viewDir ),0.0); float ndotv = max( dot( normal, viewDir ),0.0);
for( int i = 0;i < NB_LIGHTS; i+=3){ for( int i = 0;i < NB_LIGHTS; i+=3){