Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix when not using shadows.

Browse Source 
This was SVN commit r12820.
This commit is contained in:
wraitii 2012-11-04 20:39:01 +00:00
parent e633196698
commit d8f22c860d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ uniform sampler2D normalMap;
uniform sampler2D Foam;
uniform sampler2D waveTex;
#endif
#if USE_SHADOWS
#if USE_SHADOWS && USE_SHADOW
varying vec4 v_shadow;
#if USE_SHADOW_SAMPLER
uniform sampler2DShadow shadowTex;
@ -248,7 +248,7 @@ void main()
losMod = losMod < 0.03 ? 0.0 : losMod;
vec3 colour;
#if USE_SHADOWS
#if USE_SHADOWS && USE_SHADOW
float shadow = get_shadow(vec4(v_shadow.xy - 8.0*waviness*n.xz, v_shadow.zw));
float fresShadow = mix(fresnel, fresnel*shadow, 0.05 + (murkiness * 0.15));
#if USE_FOAM

2
binaries/data/mods/public/shaders/glsl/water_high.vs
View File

@ -17,7 +17,7 @@ uniform float mapSize;
varying vec3 worldPos;
varying float waterDepth;
#if USE_SHADOW
#if USE_SHADOW && USE_SHADOWS
varying vec4 v_shadow;
#endif
attribute vec3 a_vertex;