diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-10 14:50:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-10 14:50:11 -0500 |
commit | 265db1f17c74c8e21a532e2e85a623383ef84728 (patch) | |
tree | 98d3771410e4b96af9009dd6566d1481d07e8bd2 /indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl | |
parent | 17f46868d28876b65adcf24a45e6c19a20f2834c (diff) | |
parent | db92b0369194f1a81b92fd3fa72458eb0c1d2f20 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl index 3382384c99..d88612765c 100644 --- a/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl @@ -5,21 +5,24 @@ * $/LicenseInfo$ */ - +attribute vec3 position; +attribute vec4 diffuse_color; +attribute vec2 texcoord0; void calcAtmospherics(vec3 inPositionEye); void main() { //transform vertex - gl_Position = ftransform(); - gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + vec4 pos = (gl_ModelViewMatrix * vec4(position.xyz, 1.0)); + gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0); + gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0,0,1); - vec4 pos = (gl_ModelViewMatrix * gl_Vertex); + calcAtmospherics(pos.xyz); - gl_FrontColor = gl_Color; + gl_FrontColor = diffuse_color; gl_FogFragCoord = pos.z; } |