sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10503 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-03-27 19:39:41 +00:00
parent 6f54913af3
commit c689ba4e9b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/core-effects/Common/MatDefs/Water/Water.frag
View File

@ -164,6 +164,7 @@ vec4 underWater(){
vec3 refraction = color2; vec3 refraction = color2;
#ifdef ENABLE_REFRACTION #ifdef ENABLE_REFRACTION
texC = texCoord.xy *sin (fresnel+1.0); texC = texCoord.xy *sin (fresnel+1.0);
texC = clamp(texC,0.0,1.0);
refraction = texture2D(m_Texture, texC).rgb; refraction = texture2D(m_Texture, texC).rgb;
#endif #endif

3
engine/src/core-effects/Common/MatDefs/Water/Water15.frag
View File

@ -161,6 +161,7 @@ vec4 underWater(int sampleNum){
vec3 refraction = color2; vec3 refraction = color2;
#ifdef ENABLE_REFRACTION #ifdef ENABLE_REFRACTION
texC = texCoord.xy *sin (fresnel+1.0); texC = texCoord.xy *sin (fresnel+1.0);
texC = clamp(texC,0.0,1.0);
#ifdef RESOLVE_MS #ifdef RESOLVE_MS
ivec2 iTexC = ivec2(texC * textureSize(m_Texture)); ivec2 iTexC = ivec2(texC * textureSize(m_Texture));
refraction = texelFetch(m_Texture, iTexC, sampleNum).rgb; 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+ m_ReflectionDisplace * normal.x;
texC = texCoord.xy; texC = texCoord.xy;
texC += sin(m_Time*1.8 + 3.0 * abs(position.y))* (refractionScale * min(depth2, 1.0)); 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 #ifdef RESOLVE_MS
ivec2 iTexC = ivec2(texC * textureSize(m_Texture)); ivec2 iTexC = ivec2(texC * textureSize(m_Texture));
refraction = texelFetch(m_Texture, iTexC, sampleNum).rgb; refraction = texelFetch(m_Texture, iTexC, sampleNum).rgb;