fly/fgdata
1
0
Fork 0
Code Activity

Fix incorrect lightmap intensity with lightmap-multi=0

Browse source
This commit is contained in:
Fernando García Liñán 2021-04-15 11:12:07 +02:00
parent 3c50e9f789
commit 4099044b65
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Shaders/glass-ALS.frag
View file

@ -91,9 +91,10 @@ vec3 lightmapcolor = vec3(0.0, 0.0, 0.0);
if (use_reflection_lightmap == 1)
{
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * reflection_lighting;
if (lightmap_multi > 0 )
{
lightmapFactor = lightmapFactor * reflection_lighting;
lightmapcolor = lightmap_r_color * lightmapFactor.r +
lightmap_g_color * lightmapFactor.g +
lightmap_b_color * lightmapFactor.b +

3
Shaders/hud-ALS.frag
View file

@ -124,9 +124,10 @@ vec3 lightmapcolor = vec3(0.0, 0.0, 0.0);
if (use_reflection_lightmap == 1)
{
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * reflection_lighting;
if (lightmap_multi > 0 )
{
lightmapFactor = lightmapFactor * reflection_lighting;
lightmapcolor = lightmap_r_color * lightmapFactor.r +
lightmap_g_color * lightmapFactor.g +
lightmap_b_color * lightmapFactor.b +

3
Shaders/model-ALS-ultra.frag
View file

@ -515,8 +515,9 @@ void main (void)
vec3 lightmapcolor = vec3(0.0);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor,
lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ){
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r +
// lightmap_g_color * lightmapFactor.g +
// lightmap_b_color * lightmapFactor.b +

3
Shaders/model-interior-ALS-detailed.frag
View file

@ -227,9 +227,10 @@ void main()
{
vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 )
{
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r +
//lightmap_g_color * lightmapFactor.g +
// lightmap_b_color * lightmapFactor.b +

3
Shaders/model-interior-display-ALS.frag
View file

@ -321,12 +321,11 @@ void main()
{
vec4 lightmapTexel = texture2D(lightmap_texture, gl_TexCoord[0].st);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor, lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 )
{
lightmapFactor = lightmapFactor * lightmapTexel;
lightmapcolor = lightmap_r_color * lightmapFactor.r;

3
Shaders/space-ALS-ultra.frag
View file

@ -489,8 +489,9 @@ void main (void)
vec3 lightmapcolor = vec3(0.0);
vec4 lightmapFactor = vec4(lightmap_r_factor, lightmap_g_factor,
lightmap_b_factor, lightmap_a_factor);
lightmapFactor = lightmapFactor * lightmapTexel;
if (lightmap_multi > 0 ){
lightmapFactor = lightmapFactor * lightmapTexel;
//lightmapcolor = lightmap_r_color * lightmapFactor.r +
//lightmap_g_color * lightmapFactor.g +
//lightmap_b_color * lightmapFactor.b +