Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Replaces deprecated in GLSL 1.30 gl_TexCoord by varying in water shaders.

Browse Source 
This was SVN commit r27203.
This commit is contained in:
Vladislav Belov 2022-11-05 10:29:38 +00:00
parent 017fe7e263
commit 850272ee5b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/shaders/glsl/model_water.fs
View File

@ -62,8 +62,8 @@ void main()
fresnel = pow(1.0 - ndotv, 0.8); // A rather random Fresnel approximation
//refrCoords = (0.5*gl_TexCoord[2].xy - 0.8*waviness*n.xz) / gl_TexCoord[2].w + 0.5; // Unbias texture coords
//reflCoords = (0.5*gl_TexCoord[1].xy + waviness*n.xz) / gl_TexCoord[1].w + 0.5; // Unbias texture coords
//refrCoords = (0.5*v_tex2.xy - 0.8*waviness*n.xz) / v_tex2.w + 0.5; // Unbias texture coords
//reflCoords = (0.5*v_tex.xy + waviness*n.xz) / v_tex.w + 0.5; // Unbias texture coords
//vec3 dir = normalize(v + vec3(waviness*n.x, 0.0, waviness*n.z));

11
binaries/data/mods/public/shaders/glsl/waves.fs
View File

@ -8,18 +8,19 @@ uniform float width;
varying float ttime;
varying vec2 normal;
varying vec2 v_tex;
void main()
{
vec4 Tex = texture2D(waveTex, -gl_TexCoord[0].xy/8.0).rbga;
vec4 Tex = texture2D(waveTex, -v_tex.xy/8.0).rbga;
Tex.rgb -= vec3(0.5,0.0,0.5);
Tex.rb *= -1.0;
float halfwidth = (width-1.0) / 2.0;
float forceAlpha = min(1.0,2.0-abs(gl_TexCoord[0].x-halfwidth)/(halfwidth/2.0));
float val = min(1.0,gl_TexCoord[0].y);
float forceAlpha = min(1.0,2.0-abs(v_tex.x-halfwidth)/(halfwidth/2.0));
float val = min(1.0,v_tex.y);
forceAlpha *= val;
float timeAlpha = 1.0 - clamp((ttime - 6.0)/4.0,0.0,1.0);
@ -34,8 +35,8 @@ void main()
Tex.r = norm.x * normal.x - norm.y * normal.x;
Tex.b = norm.x * normal.y + norm.y * normal.y;
vec3 foam = texture2D(foamTex, -gl_TexCoord[0].xy/vec2(2.5,7.0) + vec2(0.05,-0.3)*-cos(ttime/2.0)).rbg;
foam *= texture2D(foamTex, -gl_TexCoord[0].xy/5.0 + vec2(0.8,-0.8) + vec2(-0.05,-0.25)*-cos(ttime/2.0)*1.2).rbg;
vec3 foam = texture2D(foamTex, -v_tex.xy/vec2(2.5,7.0) + vec2(0.05,-0.3)*-cos(ttime/2.0)).rbg;
foam *= texture2D(foamTex, -v_tex.xy/5.0 + vec2(0.8,-0.8) + vec2(-0.05,-0.25)*-cos(ttime/2.0)*1.2).rbg;
Tex.g = foamAlpha * clamp(foam.r * 3.0, 0.0, 1.0) * 0.4;
gl_FragColor = Tex;

3
binaries/data/mods/public/shaders/glsl/waves.vs
View File

@ -17,11 +17,12 @@ uniform mat4 transform;
varying float ttime;
varying vec2 normal;
varying vec2 v_tex;
void main()
{
normal = a_normal;
gl_TexCoord[0].xy = a_uv0.xy;
v_tex = a_uv0.xy;
float tttime = mod(time + translation ,10.0);
ttime = tttime;