From 957801ea1292d288fdd3cf88ca6e47001e7eca15 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Tue, 24 Feb 2015 21:50:03 -0500 Subject: [PATCH] SinglePass Lighting: Comment out color ramp - doesn't seem to work --- .../resources/Common/MatDefs/Light/SPLighting.frag | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jme3-core/src/main/resources/Common/MatDefs/Light/SPLighting.frag b/jme3-core/src/main/resources/Common/MatDefs/Light/SPLighting.frag index 749602ccd..69fcfa848 100644 --- a/jme3-core/src/main/resources/Common/MatDefs/Light/SPLighting.frag +++ b/jme3-core/src/main/resources/Common/MatDefs/Light/SPLighting.frag @@ -178,6 +178,11 @@ void main(){ vec4 refColor = Optics_GetEnvColor(m_EnvMap, refVec.xyz); #endif +// #ifdef COLORRAMP +// diffuseColor.rgb *= texture2D(m_ColorRamp, vec2(light.x, 0.0)).rgb; +// specularColor.rgb *= texture2D(m_ColorRamp, vec2(light.y, 0.0)).rgb; +// #endif + for( int i = 0;i < NB_LIGHTS; i+=3){ vec4 lightColor = g_LightData[i]; vec4 lightData1 = g_LightData[i+1]; @@ -205,11 +210,6 @@ 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; - #endif - // Workaround, since it is not possible to modify varying variables vec4 SpecularSum2 = vec4(SpecularSum, 1.0); #ifdef USE_REFLECTION