All: Rend2: Set cap on ambient and direct light

MAN-AT-ARMS · Mar 12, 2014 · 752ebec · 752ebec
1 parent 8493941
commit 752ebec
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/trunk/MP/code/rend2/tr_shade.c b/trunk/MP/code/rend2/tr_shade.c
@@ -1288,11 +1288,26 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 		if (pStage->rgbGen == CGEN_LIGHTING_DIFFUSE)
 		{
 			vec4_t vec;
+			vec_t cap = 1.0f / (1 << tr.overbrightBits);
 
 			VectorScale(backEnd.currentEntity->ambientLight, 1.0f / 255.0f, vec);
+			if ((vec[0] > cap) || (vec[1] > cap) || (vec[2] > cap))
+			{
+				vec_t hi = MAX(vec[0], vec[1]);
+				hi = MAX(hi, vec[2]);
+
+				VectorScale(vec, cap / hi, vec);
+			}
 			GLSL_SetUniformVec3(sp, UNIFORM_AMBIENTLIGHT, vec);
 
 			VectorScale(backEnd.currentEntity->directedLight, 1.0f / 255.0f, vec);
+			if ((vec[0] > cap) || (vec[1] > cap) || (vec[2] > cap))
+			{
+				vec_t hi = MAX(vec[0], vec[1]);
+				hi = MAX(hi, vec[2]);
+
+				VectorScale(vec, cap / hi, vec);
+			}
 			GLSL_SetUniformVec3(sp, UNIFORM_DIRECTEDLIGHT, vec);
 
 			VectorCopy(backEnd.currentEntity->lightDir, vec);

diff --git a/trunk/SP/code/rend2/tr_shade.c b/trunk/SP/code/rend2/tr_shade.c
@@ -1282,11 +1282,26 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 		if (pStage->rgbGen == CGEN_LIGHTING_DIFFUSE)
 		{
 			vec4_t vec;
+			vec_t cap = 1.0f / (1 << tr.overbrightBits);
 
 			VectorScale(backEnd.currentEntity->ambientLight, 1.0f / 255.0f, vec);
+			if ((vec[0] > cap) || (vec[1] > cap) || (vec[2] > cap))
+			{
+				vec_t hi = MAX(vec[0], vec[1]);
+				hi = MAX(hi, vec[2]);
+
+				VectorScale(vec, cap / hi, vec);
+			}
 			GLSL_SetUniformVec3(sp, UNIFORM_AMBIENTLIGHT, vec);
 
 			VectorScale(backEnd.currentEntity->directedLight, 1.0f / 255.0f, vec);
+			if ((vec[0] > cap) || (vec[1] > cap) || (vec[2] > cap))
+			{
+				vec_t hi = MAX(vec[0], vec[1]);
+				hi = MAX(hi, vec[2]);
+
+				VectorScale(vec, cap / hi, vec);
+			}
 			GLSL_SetUniformVec3(sp, UNIFORM_DIRECTEDLIGHT, vec);
 
 			VectorCopy(backEnd.currentEntity->lightDir, vec);