diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-07-28 12:15:32 -0700 |
| commit | 0b9327df241e1a5a4693c690810ce8c330e196ad (patch) | |
| tree | 1bdff29f5e3de1764410a7bf706763d4a35ebe8b /indra/newview/app_settings/shaders/class1/objects | |
| parent | 75452dd7a8f9f51bf3fbcb871976168f80e0cae0 (diff) | |
| parent | b8d5c8993d46dc5b24bc07f721115a174ff918c8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/bumpF.glsl | 17 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/bumpV.glsl | 16 |
2 files changed, 33 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpF.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpF.glsl new file mode 100644 index 0000000000..587ab93a80 --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/objects/bumpF.glsl @@ -0,0 +1,17 @@ +/** + * @file bumpF.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * $/LicenseInfo$ + */ + +uniform sampler2D texture0; +uniform sampler2D texture1; + +void main() +{ + float tex0 = texture2D(texture0, gl_TexCoord[0].xy).a; + float tex1 = texture2D(texture1, gl_TexCoord[1].xy).a; + + gl_FragColor = vec4(tex0+(1.0-tex1)-0.5); +} diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl new file mode 100644 index 0000000000..056d1a9582 --- /dev/null +++ b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl @@ -0,0 +1,16 @@ +/** + * @file bumpV.glsl + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * $/LicenseInfo$ + */ + + +void main() +{ + //transform vertex + gl_Position = gl_ModelViewProjectionMatrix*gl_Vertex; + gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + gl_TexCoord[1] = gl_TextureMatrix[1] * gl_MultiTexCoord1; + gl_FrontColor = gl_Color; +} |