diff options
author | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
commit | 5d92dc44026f7dd237aa871593080fd151064e62 (patch) | |
tree | 4f0c70e428824a0a01e38ff77850fb009b6c13f0 /indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl | |
parent | 7614ceff24129643ecb96f57f0491507e4ff8dbd (diff) | |
parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) |
merge changes for 2.7.4 release
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl b/indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl new file mode 100644 index 0000000000..149cf791f5 --- /dev/null +++ b/indra/newview/app_settings/shaders/class2/lighting/lightNonIndexedF.glsl @@ -0,0 +1,25 @@ +/** + * @file lightF.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * $/LicenseInfo$ + */ + + + +uniform sampler2D diffuseMap; + +vec3 atmosLighting(vec3 light); +vec3 scaleSoftClip(vec3 light); + +void default_lighting() +{ + vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color; + + color.rgb = atmosLighting(color.rgb); + + color.rgb = scaleSoftClip(color.rgb); + + gl_FragColor = color; +} + |