From 669b7e6e2ca96670283ff3dd6003da2622575c9e Mon Sep 17 00:00:00 2001 From: wraitii Date: Wed, 7 Nov 2012 15:40:34 +0000 Subject: [PATCH] Fixes #1714. Also updates the Mediterranean Cove map water settings. This was SVN commit r12831. --- .../data/mods/public/maps/scenarios/Mediterranean_Cove.xml | 4 ++-- binaries/data/mods/public/shaders/glsl/water_high.fs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml b/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml index 840baf6f5a..6cf296530e 100644 --- a/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml +++ b/binaries/data/mods/public/maps/scenarios/Mediterranean_Cove.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91fb4d93501e9c3bf8f8328ea3d41a48a7236e17807abd2f7f65eab72e95ba07 -size 424824 +oid sha256:8bc1b63d8de9b4fda4f2648104400d516f2ac151a791f129c8d67d050bef8a4d +size 424829 diff --git a/binaries/data/mods/public/shaders/glsl/water_high.fs b/binaries/data/mods/public/shaders/glsl/water_high.fs index eb6bd6db14..79d1019090 100644 --- a/binaries/data/mods/public/shaders/glsl/water_high.fs +++ b/binaries/data/mods/public/shaders/glsl/water_high.fs @@ -174,7 +174,7 @@ void main() float distoFactor = clamp((waterDepth/v.y)/4.0,0.0,7.0); #endif - fresnel = pow(1.0 - ndotv, 1.3333); // approximation + fresnel = pow(1.05 - ndotv, 1.3333); // approximation. I'm using 1.05 and not 1.0 because it causes artifacts, see #1714 #if USE_FOAM // texture is rotated 90°, moves slowly.