Merge pull request scp-fs2open#1633 from The-E/fix/team_colors_washed_out

Add SRGB adjustment to the team colors

Author: SamuelCho

code/def_files/data/effects/lighting.sdr

@@ -12,6 +12,7 @@ const float SPEC_FACTOR_NO_SPEC_MAP		= 0.6;
 const float ENV_ALPHA_FACTOR			= 0.3;
 const float GLOW_MAP_INTENSITY			= 1.5;
 const float AMBIENT_LIGHT_BOOST			= 1.0;
+const float GLOW_MAP_SRGB_MULTIPLIER	= 3.0;
 
 vec3 FresnelSchlick(vec3 specColor, vec3 light, vec3 halfVec)
 {

code/def_files/data/effects/main-f.sdr

@@ -293,10 +293,20 @@ void main()
  #ifdef FLAG_TEAMCOLOR
 	vec4 teamMask = vec4(0.0, 0.0, 0.0, 0.0);
 	teamMask = texture(sMiscmap, vec3(texCoord, float(sMiscmapIndex)));
-	vec3 base = max(base_color - vec3(0.5), vec3(0.0));
-	vec3 stripe = max(stripe_color - vec3(0.5), vec3(0.0));
-	baseColor.rgb += (base * teamMask.x) + (stripe * teamMask.y);
-	baseColor.rgb = max(baseColor.rgb, vec3(0.0));
+	//For team colors applied to a diffuse or spec map, we assume that the base color of the diffuse 
+	//at this point is vec3(0.5). To get accurate results, we subtract 0.5 from the team colors
+	vec3 team_color = ((base_color - vec3(0.5)) * teamMask.x) + ((stripe_color - vec3(0.5)) * teamMask.y);
+	vec3 team_color_glow = (base_color * teamMask.b) + (stripe_color * teamMask.a);
+
+	#ifdef FLAG_HDR
+	team_color = pow(team_color, vec3(SRGB_GAMMA));
+	team_color_glow = pow(team_color_glow, vec3(SRGB_GAMMA)) * GLOW_MAP_SRGB_MULTIPLIER;
+	#endif
+
+	baseColor.rgb += team_color;					
+	baseColor.rgb = max(baseColor.rgb, vec3(0.0));	// We need to make sure that nothing here ever goes negative
+	specColor.rgb += team_color;
+	specColor.rgb = max(specColor.rgb, vec3(0.03));
  #endif
 #endif
 	// Lights aren't applied when we are rendering to the G-buffers since that gets handled later
@@ -343,12 +353,12 @@ void main()
 	vec3 glowColor = texture(sGlowmap, vec3(texCoord, float(sGlowmapIndex))).rgb;
 	if(overrideGlow) glowColor = glowClr;
  #ifdef FLAG_HDR
-	glowColor = pow(glowColor, vec3(SRGB_GAMMA)) * 3.0f;
+	glowColor = pow(glowColor, vec3(SRGB_GAMMA)) * GLOW_MAP_SRGB_MULTIPLIER;
  #endif
  #ifdef FLAG_MISC_MAP
   #ifdef FLAG_TEAMCOLOR
 	float glowColorLuminance = dot(glowColor, vec3(0.299, 0.587, 0.114));
-	glowColor = team_glow_enabled ? mix((base * teamMask.b) + (stripe * teamMask.a), glowColor, clamp(glowColorLuminance - teamMask.b - teamMask.a, 0.0, 1.0)) : glowColor;
+	glowColor = team_glow_enabled ? mix(max(team_color_glow, vec3(0.0)), glowColor, clamp(glowColorLuminance - teamMask.b - teamMask.a, 0.0, 1.0)) : glowColor;
   #endif
  #endif
    emissiveColor.rgb += glowColor * GLOW_MAP_INTENSITY;