From c689ba4e9bb76b8f7514e4189e96b5e570ea8285 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Wed, 27 Mar 2013 19:39:41 +0000 Subject: [PATCH] Fixed remaining black artifacts with post waters when using the 1.5 shader and also clamped refraction tex coordinates for under water in both shader git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10503 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core-effects/Common/MatDefs/Water/Water.frag | 1 + engine/src/core-effects/Common/MatDefs/Water/Water15.frag | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/src/core-effects/Common/MatDefs/Water/Water.frag b/engine/src/core-effects/Common/MatDefs/Water/Water.frag index fd51f16fe..ab752606d 100644 --- a/engine/src/core-effects/Common/MatDefs/Water/Water.frag +++ b/engine/src/core-effects/Common/MatDefs/Water/Water.frag @@ -164,6 +164,7 @@ vec4 underWater(){ vec3 refraction = color2; #ifdef ENABLE_REFRACTION texC = texCoord.xy *sin (fresnel+1.0); + texC = clamp(texC,0.0,1.0); refraction = texture2D(m_Texture, texC).rgb; #endif diff --git a/engine/src/core-effects/Common/MatDefs/Water/Water15.frag b/engine/src/core-effects/Common/MatDefs/Water/Water15.frag index c6b2d81aa..2a26d1558 100644 --- a/engine/src/core-effects/Common/MatDefs/Water/Water15.frag +++ b/engine/src/core-effects/Common/MatDefs/Water/Water15.frag @@ -161,6 +161,7 @@ vec4 underWater(int sampleNum){ vec3 refraction = color2; #ifdef ENABLE_REFRACTION texC = texCoord.xy *sin (fresnel+1.0); + texC = clamp(texC,0.0,1.0); #ifdef RESOLVE_MS ivec2 iTexC = ivec2(texC * textureSize(m_Texture)); refraction = texelFetch(m_Texture, iTexC, sampleNum).rgb; @@ -349,7 +350,7 @@ vec4 main_multiSample(int sampleNum){ // texC = texCoord.xy+ m_ReflectionDisplace * normal.x; texC = texCoord.xy; texC += sin(m_Time*1.8 + 3.0 * abs(position.y))* (refractionScale * min(depth2, 1.0)); - texC = clamp(texC,0.0,1.0); + texC = clamp(texC,vec2(0.0),vec2(0.999)); #ifdef RESOLVE_MS ivec2 iTexC = ivec2(texC * textureSize(m_Texture)); refraction = texelFetch(m_Texture, iTexC, sampleNum).rgb;