Apply render view R/G/B multipliers only when appropriate

Author: dashodanger

source_files/edge/r_colormap.cc

@@ -654,7 +654,10 @@ class ColormapShader : public AbstractShader
         {
             RendererVertex *dest = glvert + v_idx;
 
-            dest->rgba_color[3] = alpha;
+            dest->rgba_color[0] *= render_view_red_multiplier;
+            dest->rgba_color[1] *= render_view_green_multiplier;
+            dest->rgba_color[2] *= render_view_blue_multiplier;
+            dest->rgba_color[3]  = alpha;
 
             HMM_Vec3 lit_pos;
 

source_files/edge/r_shader.cc

@@ -357,9 +357,9 @@ class dynlight_shader_c : public AbstractShader
 
                 float ity = exp(-5.44 * dist * dist);
 
-                dest->rgba_color[0] = R * ity;
-                dest->rgba_color[1] = G * ity;
-                dest->rgba_color[2] = B * ity;
+                dest->rgba_color[0] = R * ity * render_view_red_multiplier;
+                dest->rgba_color[1] = G * ity * render_view_green_multiplier;
+                dest->rgba_color[2] = B * ity * render_view_blue_multiplier;
                 dest->rgba_color[3] = alpha;
             }
 
@@ -540,9 +540,9 @@ class plane_glow_c : public AbstractShader
 
                 TexCoord(&dest->texture_coordinates[1], WhatRadius(DL), sec, &lit_pos, &dest->normal);
 
-                dest->rgba_color[0] = R;
-                dest->rgba_color[1] = G;
-                dest->rgba_color[2] = B;
+                dest->rgba_color[0] = R * render_view_red_multiplier;
+                dest->rgba_color[1] = G * render_view_green_multiplier;
+                dest->rgba_color[2] = B * render_view_blue_multiplier;
                 dest->rgba_color[3] = alpha;
             }
 
@@ -707,9 +707,9 @@ class wall_glow_c : public AbstractShader
 
                 TexCoord(&dest->texture_coordinates[1], WhatRadius(DL), sec, &lit_pos, &dest->normal);
 
-                dest->rgba_color[0] = R;
-                dest->rgba_color[1] = G;
-                dest->rgba_color[2] = B;
+                dest->rgba_color[0] = R * render_view_red_multiplier;
+                dest->rgba_color[1] = G * render_view_green_multiplier;
+                dest->rgba_color[2] = B * render_view_blue_multiplier;
                 dest->rgba_color[3] = alpha;
             }
 

source_files/edge/r_things.cc

@@ -414,19 +414,19 @@ static void RenderPSprite(PlayerSprite *psp, int which, Player *player, RegionPr
             }
             else if (!is_additive)
             {
-                dest->rgba_color[0] = data.colors[v_idx].modulate_red_ / 255.0;
-                dest->rgba_color[1] = data.colors[v_idx].modulate_green_ / 255.0;
-                dest->rgba_color[2] = data.colors[v_idx].modulate_blue_ / 255.0;
+                dest->rgba_color[0] = data.colors[v_idx].modulate_red_ / 255.0 * render_view_red_multiplier;
+                dest->rgba_color[1] = data.colors[v_idx].modulate_green_ / 255.0 * render_view_green_multiplier;
+                dest->rgba_color[2] = data.colors[v_idx].modulate_blue_ / 255.0 * render_view_blue_multiplier;
 
                 data.colors[v_idx].modulate_red_ -= 256;
                 data.colors[v_idx].modulate_green_ -= 256;
                 data.colors[v_idx].modulate_blue_ -= 256;
             }
             else
             {
-                dest->rgba_color[0] = data.colors[v_idx].add_red_ / 255.0;
-                dest->rgba_color[1] = data.colors[v_idx].add_green_ / 255.0;
-                dest->rgba_color[2] = data.colors[v_idx].add_blue_ / 255.0;
+                dest->rgba_color[0] = data.colors[v_idx].add_red_ / 255.0 * render_view_red_multiplier;
+                dest->rgba_color[1] = data.colors[v_idx].add_green_ / 255.0 * render_view_green_multiplier;
+                dest->rgba_color[2] = data.colors[v_idx].add_blue_ / 255.0 * render_view_blue_multiplier;
             }
 
             dest->rgba_color[3] = trans;
@@ -1357,19 +1357,19 @@ void RenderThing(DrawFloor *dfloor, DrawThing *dthing)
             }
             else if (!is_additive)
             {
-                dest->rgba_color[0] = data.colors[v_idx].modulate_red_ / 255.0;
-                dest->rgba_color[1] = data.colors[v_idx].modulate_green_ / 255.0;
-                dest->rgba_color[2] = data.colors[v_idx].modulate_blue_ / 255.0;
+                dest->rgba_color[0] = data.colors[v_idx].modulate_red_ / 255.0 * render_view_red_multiplier;
+                dest->rgba_color[1] = data.colors[v_idx].modulate_green_ / 255.0 * render_view_green_multiplier;
+                dest->rgba_color[2] = data.colors[v_idx].modulate_blue_ / 255.0 * render_view_blue_multiplier;
 
                 data.colors[v_idx].modulate_red_ -= 256;
                 data.colors[v_idx].modulate_green_ -= 256;
                 data.colors[v_idx].modulate_blue_ -= 256;
             }
             else
             {
-                dest->rgba_color[0] = data.colors[v_idx].add_red_ / 255.0;
-                dest->rgba_color[1] = data.colors[v_idx].add_green_ / 255.0;
-                dest->rgba_color[2] = data.colors[v_idx].add_blue_ / 255.0;
+                dest->rgba_color[0] = data.colors[v_idx].add_red_ / 255.0 * render_view_red_multiplier;
+                dest->rgba_color[1] = data.colors[v_idx].add_green_ / 255.0 * render_view_green_multiplier;
+                dest->rgba_color[2] = data.colors[v_idx].add_blue_ / 255.0 * render_view_blue_multiplier;
             }
 
             dest->rgba_color[3] = trans;

source_files/edge/r_units.cc

@@ -184,16 +184,6 @@ void EndRenderUnit(int actual_vert)
 
     unit->count = actual_vert;
 
-    // adjust colors (for special effects)
-    for (int i = 0; i < actual_vert; i++)
-    {
-        RendererVertex *v = &local_verts[current_render_vert + i];
-
-        v->rgba_color[0] *= render_view_red_multiplier;
-        v->rgba_color[1] *= render_view_green_multiplier;
-        v->rgba_color[2] *= render_view_blue_multiplier;
-    }
-
     current_render_vert += actual_vert;
     current_render_unit++;