livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in Geenz/viewer-eep-shader-fixes (pull request #322) 

Water plane rendering improvements

Approved-by: Graham Madarasz <graham@lindenlab.com>
meow-7.2.2
Rider Linden 2019-04-02 18:07:08 +00:00
parent d7b47bf71f f07a1741e9
commit 14629ca3d6
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
View File

@ -134,7 +134,7 @@ void main()
col += spec_contrib;
}
col = mix(col.rgb, diffuse.rgb, diffuse.a);
col.rgb += diffuse.a * diffuse.rgb;
if (envIntensity > 0.0)
{ //add environmentmap
@ -145,8 +145,10 @@ void main()
if (norm.w < 0.5)
{
col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
col = mix(scaleSoftClip(col), fullbrightScaleSoftClip(col), diffuse.a);
//col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
//col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
col = atmosFragLighting(col, additive, atten);
col = scaleSoftClipFrag(col);
}
#ifdef WATER_FOG

19
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@ -142,32 +142,23 @@ void main()
vec4 baseCol = texture2D(refTex, refvec4);
refcol = mix(baseCol*df2, refcol, dweight);
//get specular component
float spec = clamp(dot(lightDir, (reflect(viewVec,wavef))),0.0,1.0);
//harden specular
spec = pow(spec, 128.0);
//figure out distortion vector (ripply)
vec2 distort2 = distort+wavef.xy*refScale * 0.33/max(dmod*df1, 1.0);
vec4 fb = texture2D(screenTex, distort2);
//mix with reflection
// Note we actually want to use just df1, but multiplying by 0.999999 gets around an nvidia compiler bug
color.rgb = mix(fb.rgb, refcol.rgb, df1 * 0.99999);
vec4 pos = vary_position;
color.rgb += spec * specular;
color.rgb = atmosTransport(color.rgb);
color.rgb = scaleSoftClipFrag(color.rgb);
//color.rgb = atmosTransport(color.rgb);
//color.rgb = scaleSoftClipFrag(color.rgb) * 0;
vec3 screenspacewavef = normalize((norm_mat*vec4(wavef, 1.0)).xyz);
frag_data[0] = vec4(color.rgb, 1); // diffuse
frag_data[1] = vec4(0); // speccolor, spec
frag_data[2] = vec4(encode_normal(screenspacewavef.xyz*0.5+0.5), 0.05, 0);// normalxy, 0, 0
frag_data[1] = vec4(specular * 0.4, 0.75); // speccolor, spec
frag_data[2] = vec4(encode_normal(screenspacewavef.xyz), 0.05, 0);// normalxy, 0, 0
}

12
indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
View File

@ -146,7 +146,7 @@ void main()
col += spec_contrib;
}
col = mix(col.rgb, diffuse.rgb, diffuse.a);
col.rgb += diffuse.a * diffuse.rgb;
if (envIntensity > 0.0)
{ //add environmentmap
@ -154,13 +154,13 @@ void main()
vec3 refcol = textureCube(environmentMap, env_vec).rgb;
col = mix(col.rgb, refcol, envIntensity);
}
vec3 a = col.rgb;
if (norm.w < 0.5)
{
col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
//col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
//col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
col = atmosFragLighting(col, additive, atten);
col = scaleSoftClipFrag(col);
}
#ifdef WATER_FOG