Merge pull request #502 from SamuelCho/team_color_glows

Team color glows

Author: niffiwan

code/globalincs/def_files.cpp

@@ -1707,8 +1707,8 @@ char *Default_main_fragment_shader =
 "\n"
 "#ifdef FLAG_MISC_MAP\n"
 " #ifdef FLAG_TEAMCOLOR\n"
-"	vec2 teamMask = vec2(0.0, 0.0);\n"
-"	teamMask = texture2D(sMiscmap, texCoord).rg;\n"
+"	vec4 teamMask = vec4(0.0, 0.0, 0.0, 0.0);\n"
+"	teamMask = texture2D(sMiscmap, texCoord);\n"
 "	vec3 base = base_color - vec3(0.5);\n"
 "	vec3 stripe = stripe_color - vec3(0.5);\n"
 "	baseColor.rgb += (base * teamMask.x) + (stripe * teamMask.y);\n"
@@ -1789,7 +1789,14 @@ char *Default_main_fragment_shader =
 "#endif\n"
 "\n"
 "#ifdef FLAG_GLOW_MAP\n"
-"   baseColor.rgb += texture2D(sGlowmap, texCoord).rgb * GLOW_MAP_INTENSITY;\n"
+"	vec3 glowColor = texture2D(sGlowmap, texCoord).rgb;\n"
+" #ifdef FLAG_MISC_MAP\n"
+"  #ifdef FLAG_TEAMCOLOR\n"
+"	float glowColorLuminance = dot(glowColor, vec3(0.299, 0.587, 0.114));\n"
+"	glowColor = mix((base * teamMask.b) + (stripe * teamMask.a), glowColor, clamp(glowColorLuminance - teamMask.b - teamMask.a, 0.0, 1.0));\n"
+"  #endif\n"
+" #endif\n"
+"   baseColor.rgb += glowColor * GLOW_MAP_INTENSITY;\n"
 "#endif\n"
 "\n"
 "#ifdef FLAG_FOG\n"