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

SinglePass Lighting: Comment out color ramp - doesn't seem to work

Browse Source
This commit is contained in:
shadowislord 2015-02-24 21:50:03 -05:00
parent 550255b1d5
commit 957801ea12
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jme3-core/src/main/resources/Common/MatDefs/Light/SPLighting.frag
View File

@ -178,6 +178,11 @@ void main(){
vec4 refColor = Optics_GetEnvColor(m_EnvMap, refVec.xyz); vec4 refColor = Optics_GetEnvColor(m_EnvMap, refVec.xyz);
#endif #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){ for( int i = 0;i < NB_LIGHTS; i+=3){
vec4 lightColor = g_LightData[i]; vec4 lightColor = g_LightData[i];
vec4 lightData1 = g_LightData[i+1]; vec4 lightData1 = g_LightData[i+1];
@ -205,11 +210,6 @@ void main(){
vec2 light = computeLighting(normal, viewDir, lightDir.xyz, lightDir.w * spotFallOff , m_Shininess); 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 // Workaround, since it is not possible to modify varying variables
vec4 SpecularSum2 = vec4(SpecularSum, 1.0); vec4 SpecularSum2 = vec4(SpecularSum, 1.0);
#ifdef USE_REFLECTION #ifdef USE_REFLECTION