Permalink
Browse files

Lighting: fix colorramp feature

  • Loading branch information...
1 parent 4a37a8f commit 01227d31b022302c986acbeb0cb4a3af359c30eb @shadowislord shadowislord committed Sep 23, 2015
Showing with 6 additions and 4 deletions.
  1. +6 −4 jme3-core/src/main/resources/Common/MatDefs/Light/Lighting.frag
@@ -154,8 +154,9 @@ void main(){
#ifdef VERTEX_LIGHTING
vec2 light = vertexLightValues.xy;
#ifdef COLORRAMP
- light.x = texture2D(m_ColorRamp, vec2(light.x, 0.0)).r;
- light.y = texture2D(m_ColorRamp, vec2(light.y, 0.0)).r;
+ diffuseColor.rgb *= texture2D(m_ColorRamp, vec2(light.x, 0.0)).rgb;
+ specularColor.rgb *= texture2D(m_ColorRamp, vec2(light.y, 0.0)).rgb;
+ light.xy = vec2(1.0);
#endif
gl_FragColor.rgb = AmbientSum * diffuseColor.rgb +
@@ -183,8 +184,9 @@ void main(){
vec2 light = computeLighting(normal, viewDir, lightDir.xyz, lightDir.w * spotFallOff, m_Shininess) ;
#ifdef COLORRAMP
- diffuseColor.rgb *= texture2D(m_ColorRamp, vec2(light.x, 0.0)).rgb;
- specularColor.rgb *= texture2D(m_ColorRamp, vec2(light.y, 0.0)).rgb;
+ diffuseColor.rgb *= texture2D(m_ColorRamp, vec2(light.x, 0.0)).rgb;
+ specularColor.rgb *= texture2D(m_ColorRamp, vec2(light.y, 0.0)).rgb;
+ light.xy = vec2(1.0);
#endif
// Workaround, since it is not possible to modify varying variables

0 comments on commit 01227d3

Please sign in to comment.