From 3315fb463b2c883ea52903bb9a3c71fd613e66d9 Mon Sep 17 00:00:00 2001
From: Bart Trzynadlowski <bart.trzy@gmail.com>
Date: Sun, 22 Jan 2012 01:05:59 +0000
Subject: [PATCH] Small correction to lighting model in shaders. Light
 intensity is no longer clipped.

---
 Src/Graphics/Shaders/Fragment.glsl             | 2 +-
 Src/Graphics/Shaders/Fragment_Flat.glsl        | 7 +++----
 Src/Graphics/Shaders/Fragment_NoSpotlight.glsl | 2 +-
 Src/Graphics/Shaders/Vertex.glsl               | 3 +--
 Src/Graphics/Shaders3D.h                       | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Src/Graphics/Shaders/Fragment.glsl b/Src/Graphics/Shaders/Fragment.glsl
index e406824..09b2e6c 100644
--- a/Src/Graphics/Shaders/Fragment.glsl
+++ b/Src/Graphics/Shaders/Fragment.glsl
@@ -178,7 +178,7 @@ void main(void)
 	ellipse = (gl_FragCoord.xy-spotEllipse.xy)/spotEllipse.zw;
 	insideSpot = dot(ellipse,ellipse);
 	if ((insideSpot <= 1.0) &&  (fsViewZ>=spotRange.x) && (fsViewZ<spotRange.y))
-		lightIntensity = min(fsLightIntensity+(1.0-insideSpot)*spotColor,1.0);
+		lightIntensity = fsLightIntensity+(1.0-insideSpot)*spotColor;
 	else
 		lightIntensity = fsLightIntensity;
 	fragColor.rgb *= lightIntensity;
diff --git a/Src/Graphics/Shaders/Fragment_Flat.glsl b/Src/Graphics/Shaders/Fragment_Flat.glsl
index 1a514c5..3ddc5f4 100644
--- a/Src/Graphics/Shaders/Fragment_Flat.glsl
+++ b/Src/Graphics/Shaders/Fragment_Flat.glsl
@@ -117,7 +117,7 @@ void main(void)
 	// Textured polygons: set fragment color to texel value
 	{			
 		fragColor = texture2D(textureMap,(fsSubTexture.xy+fsSubTexture.zw/2.0)/2048.0);
-		//fragColor += texture2D(textureMap,(fsSubTexture.xy+fsSubTexture.zw))/2048.0);
+		//fragColor += texture2D(textureMap,(fsSubTexture.xy+fsSubTexture.zw)/2048.0);
 	
 	}
 
@@ -125,12 +125,11 @@ void main(void)
 	ellipse = (gl_FragCoord.xy-spotEllipse.xy)/spotEllipse.zw;
 	insideSpot = dot(ellipse,ellipse);
 	if ((insideSpot <= 1.0) &&  (fsViewZ>=spotRange.x) && (fsViewZ<spotRange.y))
-		lightIntensity = min(fsLightIntensity+(1.0-insideSpot)*spotColor,1.0);
+		lightIntensity = fsLightIntensity+(1.0-insideSpot)*spotColor;
 	else
 		lightIntensity = fsLightIntensity;
 	fragColor.rgb *= lightIntensity;
-	fragColor.rgb *= fsLightIntensity;
-
+		
 	// Translucency (modulates existing alpha channel for RGBA4 texels)
 	fragColor.a *= fsTransLevel;
 
diff --git a/Src/Graphics/Shaders/Fragment_NoSpotlight.glsl b/Src/Graphics/Shaders/Fragment_NoSpotlight.glsl
index ba8592c..05e643a 100644
--- a/Src/Graphics/Shaders/Fragment_NoSpotlight.glsl
+++ b/Src/Graphics/Shaders/Fragment_NoSpotlight.glsl
@@ -183,7 +183,7 @@ void main(void)
 	ellipse = (gl_FragCoord.xy-spotEllipse.xy)/spotEllipse.zw;
 	insideSpot = dot(ellipse,ellipse);
 	if ((insideSpot <= 1.0) &&  (fsViewZ>=spotRange.x) && (fsViewZ<spotRange.y))
-		lightIntensity = min(fsLightIntensity+(1.0-insideSpot)*spotColor,1.0);
+		lightIntensity = fsLightIntensity+(1.0-insideSpot)*spotColor;
 	else
 		lightIntensity = fsLightIntensity;
 	fragColor.rgb *= lightIntensity;
diff --git a/Src/Graphics/Shaders/Vertex.glsl b/Src/Graphics/Shaders/Vertex.glsl
index 18e4945..27274ab 100644
--- a/Src/Graphics/Shaders/Vertex.glsl
+++ b/Src/Graphics/Shaders/Vertex.glsl
@@ -125,8 +125,7 @@ void main(void)
 		sunFactor = max(dot(sunVector,viewNormal),0.0);
 		
 		// Total light intensity: sum of all components
-		fsLightIntensity *= (sunFactor*lighting[1].x+lighting[1].y);
-		fsLightIntensity = clamp(fsLightIntensity,0.0,1.0);
+		fsLightIntensity *= (sunFactor*lighting[1].x+lighting[1].y);		
 	}
 	
 	// Fog
diff --git a/Src/Graphics/Shaders3D.h b/Src/Graphics/Shaders3D.h
index ee481c7..391ef67 100644
--- a/Src/Graphics/Shaders3D.h
+++ b/Src/Graphics/Shaders3D.h
@@ -158,7 +158,6 @@ static const char vertexShaderSource[] =
 "																						\n"
 "		// Total light intensity: sum of all components									\n"
 "		fsLightIntensity *= (sunFactor*lighting[1].x+lighting[1].y);					\n"
-"		fsLightIntensity = clamp(fsLightIntensity,0.0,1.0);								\n"
 "	}																					\n"
 "																						\n"
 "	// Fog																				\n"
@@ -355,7 +354,7 @@ static const char fragmentShaderSource[] =
 "	ellipse = (gl_FragCoord.xy-spotEllipse.xy)/spotEllipse.zw;								\n"
 "	insideSpot = dot(ellipse,ellipse);														\n"
 "	if ((insideSpot <= 1.0) &&  (fsViewZ>=spotRange.x) && (fsViewZ<spotRange.y))			\n"
-"		lightIntensity = min(fsLightIntensity+(1.0-insideSpot)*spotColor,1.0);				\n"
+"		lightIntensity = fsLightIntensity+(1.0-insideSpot)*spotColor;						\n"
 "	else																					\n"
 "		lightIntensity = fsLightIntensity;													\n"
 "	fragColor.rgb *= lightIntensity;														\n"