yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-26 22:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #569 from bibendovsky/fix/508_liquid_shader

Browse source 
Move liquid transformations into fragment shader
This commit is contained in:
Yamagi 2020-05-11 11:31:41 +02:00 committed by GitHub
commit 94caa85a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/client/refresh/gl3/gl3_shaders.c
View file

@ -414,7 +414,13 @@ static const char* fragmentSrc3Dwater = MULTILINE_STRING(
void main()
{
vec4 texel = texture(tex, passTexCoord);
vec2 tc = passTexCoord;
tc.s += sin( passTexCoord.t*0.125 + time ) * 4;
tc.s += scroll;
tc.t += sin( passTexCoord.s*0.125 + time ) * 4;
tc *= 1.0/64.0; // do this last
vec4 texel = texture(tex, tc);
// apply intensity and gamma
texel.rgb *= intensity*0.5;
@ -586,12 +592,7 @@ static const char* vertexSrc3Dwater = MULTILINE_STRING(
// it gets attributes and uniforms from vertexCommon3D
void main()
{
vec2 tc = texCoord;
tc.s += sin( texCoord.t*0.125 + time ) * 4;
tc.s += scroll;
tc.t += sin( texCoord.s*0.125 + time ) * 4;
tc *= 1.0/64.0; // do this last
passTexCoord = tc;
passTexCoord = texCoord;
gl_Position = transProj * transView * transModel * vec4(position, 1.0);
}