From 931c18cb5191c708ef9e489d557a68fdae27bbe8 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Wed, 4 Sep 2013 19:29:32 +0200
Subject: [PATCH] Diffuse texenv should work with the material color, not the
 diffuse color. Also modulate the texenv result with vertex color if
 applicable. Also add the shader type as comment in the top of the shader.

--HG--
branch : gsoc2013-dfighter
---
 .../OpenGL3/driver_glsl_shader_generator.cpp  | 55 +++++++++++++++++--
 .../OpenGL3/driver_glsl_shader_generator.h    |  1 +
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.cpp b/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.cpp
index 28ecfaba4..e2815ece6 100644
--- a/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.cpp
+++ b/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.cpp
@@ -108,6 +108,20 @@ namespace NL3D
 		"constant3"
 	};
 
+	const char *shaderNames[] = 
+	{
+		"Normal",
+		"Bump",
+		"Usercolor",
+		"Lightmap",
+		"Specular",
+		"Caustics",
+		"Per-Pixel Lighting",
+		"Per-Pixel Lighting, no specular",
+		"Cloud",
+		"Water"
+	};
+
 	CGLSLShaderGenerator::CGLSLShaderGenerator()
 	{
 		reset();
@@ -129,6 +143,8 @@ namespace NL3D
 	{
 		ss.str( "" );
 		ss.clear();
+		ss << "// " << shaderNames[ material->getShader() ] << " Vertex Shader" << std::endl;
+		ss << std::endl;
 
 		ss << "#version 330" << std::endl;
 		ss << "uniform mat4 mvpMatrix;" << std::endl;
@@ -190,6 +206,9 @@ namespace NL3D
 		ss.str( "" );
 		ss.clear();
 
+		ss << "// " << shaderNames[ material->getShader() ] << " Pixel Shader" << std::endl;
+		ss << std::endl;
+
 		ss << "#version 330" << std::endl;
 		ss << std::endl;
 
@@ -247,6 +266,17 @@ namespace NL3D
 		ss << std::endl;
 	}
 
+	void CGLSLShaderGenerator::addColor()
+	{
+		CRGBA color = material->getColor();
+		ss << "vec4 mcolor = vec4( ";
+		ss << color.R / 255.0f << ", ";
+		ss << color.G / 255.0f << ", ";
+		ss << color.B / 255.0f << ", ";
+		ss << color.A / 255.0f << " );";
+		ss << std::endl;
+	}
+
 	void CGLSLShaderGenerator::addConstants()
 	{
 		int j = 0;
@@ -458,7 +488,7 @@ namespace NL3D
 		ss << "void main( void )" << std::endl;
 		ss << "{" << std::endl;
 
-		addDiffuse();
+		addColor();
 
 		bool textures = false;
 		sampler = 0;
@@ -474,13 +504,26 @@ namespace NL3D
 			sampler++;
 		}
 
-		if( textures )
+		bool vertexColor = false;
+		if( hasFlag( vbFormat, vertexFlags[ PrimaryColor ] ) )
+			vertexColor = true;
+
+		if( textures && !vertexColor )
 			ss << "vec4 texel = vec4( 1.0, 1.0, 1.0, 1.0 );" << std::endl;
+		else
+		if( vertexColor )
+			ss << "vec4 texel = color;" << std::endl;
 		else
 			ss << "vec4 texel = vec4( 0.5, 0.5, 0.5, 1.0 );" << std::endl;
 
 		generateTexEnv();
 
+		// This is just an idea I had, but it seems to be working.
+		// Unfortunately it's not documented anywhere I looked in the GL spec, but if I don't have this modulation here,
+		// the Ryzom UI looks horrific.
+		if( vertexColor )
+			ss << "texel = color * texel;" << std::endl;
+
 		// Alpha test
 		//ss << "if( texel.a <= 0.5 ) discard;" << std::endl;
 	
@@ -786,19 +829,19 @@ namespace NL3D
 				switch( op )
 				{
 				case CMaterial::SrcColor:
-					ds << "diffuse.rgb";
+					ds << "mcolor.rgb";
 					break;
 
 				case CMaterial::InvSrcColor:
-					ds << "( vec3( 1.0, 1.0, 1.0 ) - diffuse.rgb )";
+					ds << "( vec3( 1.0, 1.0, 1.0 ) - mcolor.rgb )";
 					break;
 
 				case CMaterial::SrcAlpha:
-					ds << "diffuse.a";
+					ds << "mcolor.a";
 					break;
 
 				case CMaterial::InvSrcAlpha:
-					ds << "( 1.0 - diffuse.a )";
+					ds << "( 1.0 - mcolor.a )";
 					break;
 				}
 			break;
diff --git a/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.h b/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.h
index da9046dd2..30e6f581b 100644
--- a/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.h
+++ b/code/nel/src/3d/driver/OpenGL3/driver_glsl_shader_generator.h
@@ -40,6 +40,7 @@ namespace NL3D
 
 	private:
 		void addDiffuse();
+		void addColor();
 		void addConstants();
 
 		void generateNormalVS();