teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1836 from OpenMW/water-shader-tabs

Browse source 
Sort out some tabs which snuck into the water shader
This commit is contained in:
AnyOldName3 2018-08-01 14:08:16 +01:00 committed by GitHub
commit 66c241337d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
files/shaders/water_fragment.glsl
View file

@ -194,9 +194,9 @@ void main(void)
float bump = mix(BUMP,BUMP_RAIN,rainIntensity); float bump = mix(BUMP,BUMP_RAIN,rainIntensity);
vec3 normal = (normal0 * bigWaves.x + normal1 * bigWaves.y + vec3 normal = (normal0 * bigWaves.x + normal1 * bigWaves.y +
normal2 * midWaves.x + normal3 * midWaves.y + normal2 * midWaves.x + normal3 * midWaves.y +
normal4 * smallWaves.x + normal5 * smallWaves.y + normal4 * smallWaves.x + normal5 * smallWaves.y +
rippleAdd); rippleAdd);
normal = normalize(vec3(normal.x * bump, normal.y * bump, normal.z)); normal = normalize(vec3(normal.x * bump, normal.y * bump, normal.z));
@ -204,9 +204,9 @@ void main(void)
// normal for sunlight scattering // normal for sunlight scattering
vec3 lNormal = (normal0 * bigWaves.x * 0.5 + normal1 * bigWaves.y * 0.5 + vec3 lNormal = (normal0 * bigWaves.x * 0.5 + normal1 * bigWaves.y * 0.5 +
normal2 * midWaves.x * 0.2 + normal3 * midWaves.y * 0.2 + normal2 * midWaves.x * 0.2 + normal3 * midWaves.y * 0.2 +
normal4 * smallWaves.x * 0.1 + normal5 * smallWaves.y * 0.1 + normal4 * smallWaves.x * 0.1 + normal5 * smallWaves.y * 0.1 +
rippleAdd).xyz; rippleAdd).xyz;
lNormal = normalize(vec3(lNormal.x * bump, lNormal.y * bump, lNormal.z)); lNormal = normalize(vec3(lNormal.x * bump, lNormal.y * bump, lNormal.z));
lNormal = vec3(-lNormal.x, -lNormal.y, lNormal.z); lNormal = vec3(-lNormal.x, -lNormal.y, lNormal.z);