GL3: Fix tex coord (fixes landscape near rendering)

--HG--
branch : opengl3

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

@@ -572,7 +572,10 @@ namespace NL3D
 		// Light color
 		ss << "vec4 diffuse = vec4(1.0, 1.0, 1.0, 1.0);" << std::endl;
 		if (desc->lightingEnabled())
+		{
 			ss << "diffuse = applyLights(diffuse);" << std::endl;
+			ss << "diffuse.a = 1.0;" << std::endl;
+		}
 		if (hasFlag(vbFormat, g_VertexFlags[PrimaryColor]))
 			ss << "diffuse = color * diffuse;" << std::endl; // TODO: If this is the correct location, we should premultiply light and color in VS.
 
@@ -582,10 +585,10 @@ namespace NL3D
 			if (desc->getUseTexStage(i))
 			{
 				ss << "vec4 texel" << i << " = texture(sampler" << i << ", ";				
-				if (!desc->getUseFirstTexCoords()) // FIXME: What is this???
-					ss << g_AttribNames[ TexCoord0 + i ] << ".st);";
+				if (desc->hasVBFlags(g_VertexFlags[TexCoord0 + i]))
+					ss << g_AttribNames[TexCoord0 + i] << ".st);";
 				else
-					ss << g_AttribNames[ TexCoord0 ] << ".st);";
+					ss << g_AttribNames[TexCoord0] << ".st);";
 				ss << std::endl;
 				textures = true;
 			}

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

@@ -573,25 +573,14 @@ void CDriverGL3::generateShaderDesc(CShaderDesc &desc, CMaterial &mat)
 
 		for (int i = 0; i < maxTextures; i++)
 		{
-			if (desc.hasVBFlags(g_VertexFlags[ TexCoord0 + i ]))
+			// GL3 TEX COORD
+			if (mat.getTexture(i) != NULL && (desc.hasVBFlags(g_VertexFlags[TexCoord0]) || desc.hasVBFlags(g_VertexFlags[TexCoord0 + i])))
 			{
 				desc.setUseTexStage(i, true);
 				useTextures = true;
 			}
 		}
 
-		if (useTextures && !desc.getUseTexStage(1))
-		{
-			for (int i = 1; i < maxTextures; i++)
-			{
-				if (mat.getTexture(i) != NULL)
-				{
-					desc.setUseTexStage(i, true);
-					desc.setUseFirstTexCoords(true);
-				}
-			}
-		}
-		else
 		if (!useTextures)
 		{
 			desc.setNoTextures(true);

code/nel/src/3d/driver/opengl3/driver_opengl_shader_desc.h

@@ -91,7 +91,7 @@ namespace NL3D
 			
 			for (int i = 0; i < IDRV_MAT_MAXTEXTURES; i++)
 				useTextureStage[ i ] = false;
-			useFirstTextureCoordSet = false;
+			//useFirstTextureCoordSet = false;
 			noTextures = true;
 			
 			features = None;
@@ -140,8 +140,8 @@ namespace NL3D
 
 			if (shaderType == Normal)
 			{
-				if (useFirstTextureCoordSet != o.useFirstTextureCoordSet)
-					return false;
+				//if (useFirstTextureCoordSet != o.useFirstTextureCoordSet)
+				//	return false;
 
 				for (int i = 0; i < IDRV_MAT_MAXTEXTURES; i++)
 					if (texEnvMode[ i ] != o.texEnvMode[ i ])
@@ -164,8 +164,8 @@ namespace NL3D
 
 		void setTexEnvMode(uint32 index, uint32 mode) { texEnvMode[ index ] = mode; }
 		
-		void setUseFirstTexCoords(bool b) { useFirstTextureCoordSet = b; }
-		bool getUseFirstTexCoords() const{ return useFirstTextureCoordSet; }
+		//void setUseFirstTexCoords(bool b) { useFirstTextureCoordSet = b; }
+		//bool getUseFirstTexCoords() const{ return useFirstTextureCoordSet; }
 
 		void setUseTexStage(uint8 stage, bool b) { useTextureStage[ stage ] = b; }
 		bool getUseTexStage(uint8 stage) const{ return useTextureStage[ stage ]; }
@@ -257,7 +257,7 @@ namespace NL3D
 		uint32 features;
 		uint32 texEnvMode[ IDRV_MAT_MAXTEXTURES ];
 		bool useTextureStage[ IDRV_MAT_MAXTEXTURES ];
-		bool useFirstTextureCoordSet;
+		//bool useFirstTextureCoordSet;
 		bool noTextures;
 		uint32 vbFlags;
 		uint32 shaderType;