From dd81f9bf3003ff120ce54d390edfe2ec9cd7f486 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Tue, 15 May 2001 17:38:02 +0000 Subject: [PATCH] Change light setting from 256 and 200 to 255, for fullbright models. --- nq/source/gl_rmain.c | 12 ++++++------ qw/source/gl_rmain.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nq/source/gl_rmain.c b/nq/source/gl_rmain.c index ba6cfe813..d580cc35f 100644 --- a/nq/source/gl_rmain.c +++ b/nq/source/gl_rmain.c @@ -364,8 +364,10 @@ GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, float ble if (!fb) { // normals and vertexes come from the frame list // blend the light intensity from the two frames together - light = shadelight * ((shadedots[verts1->lightnormalindex] * lerp) - + (shadedots[verts2->lightnormalindex] * blend)); + light = shadelight * ((shadedots[verts1->lightnormalindex] * + lerp) + + (shadedots[verts2->lightnormalindex] * + blend)); glColor4f (shadecolor[0] * light, shadecolor[1] * light, shadecolor[2] * light, modelalpha); } @@ -384,7 +386,6 @@ GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, float ble if (modelalpha != 1.0) glDepthMask (GL_TRUE); glColor3ubv (lighthalf_v); - } @@ -642,8 +643,7 @@ R_DrawAliasModel (entity_t *e) if (cl_dlights[lnum].die >= cl.time) { VectorSubtract (currententity->origin, cl_dlights[lnum].origin, dist); - add = - (cl_dlights[lnum].radius * cl_dlights[lnum].radius * 8) / + add = (cl_dlights[lnum].radius * cl_dlights[lnum].radius * 8) / (DotProduct (dist, dist)); // FIXME Deek if (add > 0) @@ -662,7 +662,7 @@ R_DrawAliasModel (entity_t *e) if (strnequal (clmodel->name, "progs/flame", 11) || strnequal (clmodel->name, "progs/bolt", 10)) { modelIsFullbright = true; - shadelight = 200; // make certain models full brightness always + shadelight = 255; // make certain models full brightness always } shadedots = r_avertexnormal_dots[((int) (e->angles[1] * (SHADEDOT_QUANT / 360.0))) & (SHADEDOT_QUANT - 1)]; diff --git a/qw/source/gl_rmain.c b/qw/source/gl_rmain.c index 63d3720da..11e3174b5 100644 --- a/qw/source/gl_rmain.c +++ b/qw/source/gl_rmain.c @@ -363,8 +363,10 @@ GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, float ble if (!fb) { // normals and vertexes come from the frame list // blend the light intensity from the two frames together - light = shadelight * ((shadedots[verts1->lightnormalindex] * lerp) - + (shadedots[verts2->lightnormalindex] * blend)); + light = shadelight * ((shadedots[verts1->lightnormalindex] * + lerp) + + (shadedots[verts2->lightnormalindex] * + blend)); glColor4f (shadecolor[0] * light, shadecolor[1] * light, shadecolor[2] * light, modelalpha); } @@ -383,7 +385,6 @@ GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, float ble if (modelalpha != 1.0) glDepthMask (GL_TRUE); glColor3ubv (lighthalf_v); - } @@ -641,8 +642,7 @@ R_DrawAliasModel (entity_t *e) if (cl_dlights[lnum].die >= cl.time) { VectorSubtract (currententity->origin, cl_dlights[lnum].origin, dist); - add = - (cl_dlights[lnum].radius * cl_dlights[lnum].radius * 8) / + add = (cl_dlights[lnum].radius * cl_dlights[lnum].radius * 8) / (DotProduct (dist, dist)); // FIXME Deek if (add > 0) @@ -661,7 +661,7 @@ R_DrawAliasModel (entity_t *e) if (strnequal (clmodel->name, "progs/flame", 11) || strnequal (clmodel->name, "progs/bolt", 10)) { modelIsFullbright = true; - shadelight = 256; // make certain models full brightness always + shadelight = 255; // make certain models full brightness always } shadedots = r_avertexnormal_dots[((int) (e->angles[1] * (SHADEDOT_QUANT / 360.0))) & (SHADEDOT_QUANT - 1)];