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

Merge cleanup.

meow-7.2.2
Dave Parks 2011-08-10 15:34:48 -05:00
parent 265db1f17c
commit 364f8771ed
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/app_settings/shaders/class1/objects/impostorF.glsl
View File

@ -5,22 +5,19 @@
* $/LicenseInfo$
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light);
uniform sampler2D diffuseMap;
void main()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
{
discard;
}
gl_FragColor = color;
}
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
void main()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy);
if (color.a < minimum_alpha || color.a > maximum_alpha)
{
discard;
}
gl_FragColor = color;
}

12
indra/newview/app_settings/shaders/class1/objects/impostorV.glsl
View File

@ -5,12 +5,14 @@
* $/LicenseInfo$
*/
attribute vec3 position;
attribute vec2 texcoord0;
void main()
{
//transform vertex
gl_Position = ftransform();
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
gl_FrontColor = gl_Color;
gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0);
gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0, 0, 1);
}

9
indra/newview/lldrawpoolavatar.cpp
View File

@ -581,11 +581,6 @@ void LLDrawPoolAvatar::beginImpostor()
gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
sDiffuseChannel = 0;
if (LLGLSLShader::sNoFixedFunction)
{
gUIProgram.bind();
}
}
void LLDrawPoolAvatar::endImpostor()
@ -595,10 +590,6 @@ void LLDrawPoolAvatar::endImpostor()
gImpostorProgram.unbind();
}
gPipeline.enableLightsDynamic();
if (LLGLSLShader::sNoFixedFunction)
{
gUIProgram.unbind();
}
}
void LLDrawPoolAvatar::beginRigid()