Renamed light[n]Col to light[n]ColDiff.

--HG--
branch : gsoc2013-dfighter

code/nel/include/nel/3d/i_program_object.h

@@ -58,14 +58,14 @@ namespace NL3D
 			Light5Dir,
 			Light6Dir,
 			Light7Dir,
-			Light0Col,
-			Light1Col,
-			Light2Col,
-			Light3Col,
-			Light4Col,
-			Light5Col,
-			Light6Col,
-			Light7Col,
+			Light0ColDiff,
+			Light1ColDiff,
+			Light2ColDiff,
+			Light3ColDiff,
+			Light4ColDiff,
+			Light5ColDiff,
+			Light6ColDiff,
+			Light7ColDiff,
 			NUM_UNIFORMS
 		};
 

code/nel/src/3d/driver/OpenGL3/driver_glsl_program.cpp

@@ -204,14 +204,14 @@ namespace NL3D
 		"light5Dir",
 		"light6Dir",
 		"light7Dir",
-		"light0Col",
-		"light1Col",
-		"light2Col",
-		"light3Col",
-		"light4Col",
-		"light5Col",
-		"light6Col",
-		"light7Col",
+		"light0ColDiff",
+		"light1ColDiff",
+		"light2ColDiff",
+		"light3ColDiff",
+		"light4ColDiff",
+		"light5ColDiff",
+		"light6ColDiff",
+		"light7ColDiff",
 	};
 
 	void CGLSLProgram::cacheUniformIndices()

code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.cpp

@@ -359,7 +359,7 @@ namespace NL3D
 				break;
 
 			case CShaderDesc::Directional:
-				ss << "uniform vec4 light" << i << "Col;" << std::endl;
+				ss << "uniform vec4 light" << i << "ColDiff;" << std::endl;
 				break;
 			}
 		}
@@ -440,7 +440,7 @@ namespace NL3D
 	{
 		ss << "vec4 applyLights( vec4 col )" << std::endl;
 		ss << "{" << std::endl;
-		ss << "col = col * intensity0 * light0Col;" << std::endl;
+		ss << "col = col * intensity0 * light0ColDiff;" << std::endl;
 		ss << "return col;" << std::endl;
 		ss << "}" << std::endl;
 	}

code/nel/src/3d/driver/OpenGL3/driver_opengl_program.cpp

@@ -391,7 +391,7 @@ namespace NL3D
 				setUniform3f( ld, d.direction[ 0 ], d.direction[ 1 ], d.direction[ 2 ] );
 			}
 
-			int lc = currentProgram->getUniformIndex( IProgramObject::EUniform( IProgramObject::Light0Col + i ) );
+			int lc = currentProgram->getUniformIndex( IProgramObject::EUniform( IProgramObject::Light0ColDiff + i ) );
 			if( lc != -1 )
 			{
 				setUniform4f( lc, 1.0f, 1.0f, 1.0f, 1.0f );