diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
commit | 837e4e5165cc3e6595577e90bae240e676be8ffe (patch) | |
tree | 85c8e8a8cb6adf8abc87fe3a70d4513a1ab625e5 /indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl | |
parent | 570d02dc7e41c3e08477e7f759d632db78690eb4 (diff) | |
parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) |
Merge with viewer-experience
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl index 7c9b7c218f..e9c27dbefd 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl @@ -22,16 +22,33 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif +VARYING vec4 vertex_color; +VARYING vec2 vary_texcoord0; +VARYING vec3 vary_texcoord1; -uniform sampler2D diffuseMap; uniform samplerCube environmentMap; -void shiny_lighting() +vec3 scaleSoftClip(vec3 light); +vec3 atmosLighting(vec3 light); +vec4 applyWaterFog(vec4 color); + +void shiny_lighting() { - vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 color = diffuseLookup(vary_texcoord0.xy); + color.rgb *= vertex_color.rgb; + + vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb; + color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a); + + color.rgb = atmosLighting(color.rgb); + + color.rgb = scaleSoftClip(color.rgb); + color.a = max(color.a, vertex_color.a); gl_FragColor = color; } |