Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32

Browse Source
This commit is contained in:
Siana Gearz
2011-11-23 23:21:14 +01:00
parent f0108c17b9 e46c906a8b
commit b8eb3076ce
83 changed files with 1463 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
View File

@@ -7,7 +7,6 @@
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
@@ -17,7 +16,7 @@ void main()
{
vec4 col = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color;
if (col.a < minimum_alpha || col.a > maximum_alpha)
if (col.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
View File

@@ -8,13 +8,12 @@
varying vec3 vary_normal;
uniform float minimum_alpha;
uniform float maximum_alpha;
void main()
{
vec4 col = diffuseLookup(gl_TexCoord[0].xy) * gl_Color;
if (col.a < minimum_alpha || col.a > maximum_alpha)
if (col.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
uniform sampler2D normalMap;
@@ -15,7 +14,7 @@ uniform sampler2D specularMap;
void main()
{
vec4 col = texture2D(diffuseMap, gl_TexCoord[0].xy);
if (col.a < minimum_alpha || col.a > maximum_alpha)
if (col.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
@@ -16,7 +15,7 @@ void main()
{
float alpha = texture2D(diffuseMap, gl_TexCoord[0].xy).a * gl_Color.a;
if (alpha < minimum_alpha || alpha > maximum_alpha)
if (alpha < minimum_alpha)
{
discard;
}

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

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light);
@@ -17,7 +16,7 @@ void main()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightAlphaMaskF.glsl
View File

@@ -7,7 +7,6 @@
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 atmosLighting(vec3 light);
vec3 scaleSoftClip(vec3 light);
@@ -16,7 +15,7 @@ void default_lighting()
{
vec4 color = diffuseLookup(gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightAlphaMaskNonIndexedF.glsl
View File

@@ -7,7 +7,6 @@
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
@@ -19,7 +18,7 @@ void default_lighting()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightFullbrightAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light);
@@ -15,7 +14,7 @@ void fullbright_lighting()
{
vec4 color = diffuseLookup(gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightFullbrightNonIndexedAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light);
@@ -17,7 +16,7 @@ void fullbright_lighting()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightFullbrightWaterAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec4 diffuseLookup(vec2 texcoord);
@@ -17,7 +16,7 @@ void fullbright_lighting_water()
{
vec4 color = diffuseLookup(gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightFullbrightWaterNonIndexedAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
@@ -17,7 +16,7 @@ void fullbright_lighting_water()
{
vec4 color = texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightWaterAlphaMaskF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
vec3 atmosLighting(vec3 light);
vec4 applyWaterFog(vec4 color);
@@ -15,7 +14,7 @@ void default_lighting_water()
{
vec4 color = diffuseLookup(gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}

3
indra/newview/app_settings/shaders/class2/lighting/lightWaterAlphaMaskNonIndexedF.glsl
View File

@@ -6,7 +6,6 @@
*/
uniform float minimum_alpha;
uniform float maximum_alpha;
uniform sampler2D diffuseMap;
@@ -17,7 +16,7 @@ void default_lighting_water()
{
vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;
if (color.a < minimum_alpha || color.a > maximum_alpha)
if (color.a < minimum_alpha)
{
discard;
}