dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making sure LOS really is black after Reveal Map option is used...

Browse source 
This was SVN commit r12565.
This commit is contained in:
myconid 2012-08-31 18:33:03 +00:00
parent ff2ffa384b
commit e8758b8bf1
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binaries/data/mods/public/shaders/glsl/model_common.fs
View file

@ -246,7 +246,7 @@ void main()
#if !IGNORE_LOS
float los = texture2D(losTex, v_los).a;
los = los < 0.01 ? 0.0 : los;
los = los < 0.03 ? 0.0 : los;
color *= los;
#endif

2
binaries/data/mods/public/shaders/glsl/terrain_common.fs
View file

@ -219,7 +219,7 @@ void main()
#endif
float los = texture2D(losTex, v_los).a;
los = los < 0.01 ? 0.0 : los;
los = los < 0.03 ? 0.0 : los;
color *= los;
#if DECAL

2
binaries/data/mods/public/shaders/glsl/water_high.fs
View file

@ -53,7 +53,7 @@ void main()
specular = pow(max(0.0, ndoth), shininess) * sunColor * specularStrength;
losMod = texture2D(losMap, gl_TexCoord[3].st).a;
losMod = losMod < 0.01 ? 0.0 : losMod;
losMod = losMod < 0.03 ? 0.0 : losMod;
gl_FragColor.rgb = mix(refrColor + 0.3*specular, reflColor + specular, fresnel) * losMod;

4
source/graphics/LOSTexture.cpp
View file

@ -138,7 +138,9 @@ void CLOSTexture::InterpolateLOS()
m_smoothShader->BeginPass();
CShaderProgramPtr shader = m_smoothShader->GetShader();
shader->Bind();
glDisable(GL_BLEND);
shader->Bind();
shader->BindTexture("losTex1", m_Texture);
shader->BindTexture("losTex2", whichTex ? m_TextureSmooth1 : m_TextureSmooth2);